From f28db4185cdbc3dbe849acffb49c5cc9d98e5c3d Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 20 Feb 2008 20:24:08 +0000 Subject: [PATCH] Since my python sucks and I don't feel like troubleshooting it at the moment, commenting out all the DEBUG code in catalyst_lock and rolling up 2.0.6_pre8 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1317 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- modules/catalyst_lock.py | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd845773..cb6c5698 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 20 Feb 2008; Chris Gianelloni catalyst, + modules/catalyst_lock.py: + Since my python sucks and I don't feel like troubleshooting it at the + moment, commenting out all the DEBUG code in catalyst_lock and rolling up + 2.0.6_pre8 for testing. + 20 Feb 2008; Chris Gianelloni AUTHORS, catalyst, modules/builder.py, modules/catalyst_lock.py: Added some extra debug output to catalyst_lock.py and added Stuart Longland diff --git a/catalyst b/catalyst index 4c917c1f..4c634d99 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.6_pre7" +__version__="2.0.6_pre8" conf_values={} diff --git a/modules/catalyst_lock.py b/modules/catalyst_lock.py index f17f9a86..d89cda77 100755 --- a/modules/catalyst_lock.py +++ b/modules/catalyst_lock.py @@ -58,8 +58,8 @@ class LockDir: def set_gid(self,gid): if not self.islocked(): - if self.settings.has_key("DEBUG"): - print "setting gid to", gid +# if self.settings.has_key("DEBUG"): +# print "setting gid to", gid self.gid=gid def set_lockdir(self,lockdir): @@ -70,22 +70,22 @@ class LockDir: if lockdir[-1] == "/": lockdir=lockdir[:-1] self.lockdir=normpath(lockdir) - if self.settings.has_key("DEBUG"): - print "setting lockdir to", self.lockdir +# if self.settings.has_key("DEBUG"): +# print "setting lockdir to", self.lockdir else: raise "the lock object needs a path to a dir" def set_lockfilename(self,lockfilename): if not self.islocked(): self.lockfilename=lockfilename - if self.settings.has_key("DEBUG"): - print "setting lockfilename to", self.lockfilename - +# if self.settings.has_key("DEBUG"): +# print "setting lockfilename to", self.lockfilename + def set_lockfile(self): if not self.islocked(): self.lockfile=normpath(self.lockdir+'/'+self.lockfilename) - if self.settings.has_key("DEBUG"): - print "setting lockfile to", self.lockfile +# if self.settings.has_key("DEBUG"): +# print "setting lockfile to", self.lockfile def read_lock(self): if not self.locking_method == "HARDLOCK": @@ -210,8 +210,8 @@ class LockDir: os.unlink(self.lockfile) os.close(self.myfd) self.myfd=None - if self.settings.has_key("DEBUG"): - print "Unlinked lockfile..." +# if self.settings.has_key("DEBUG"): +# print "Unlinked lockfile..." except SystemExit, e: raise except Exception, e: @@ -259,9 +259,9 @@ class LockDir: except SystemExit, e: raise except Exception, e: - if self.settings.has_key("DEBUG"): - print "lockfile(): Hardlink: Link failed." - print "Exception: ",e +# if self.settings.has_key("DEBUG"): +# print "lockfile(): Hardlink: Link failed." +# print "Exception: ",e pass if self.hardlink_is_mine(self.myhardlock, self.lockfile): -- 2.26.2