diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 14:28:01 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 14:28:01 -0500 |
| commit | 5e0265f837f0eb72123be0b5150451aebdf8b031 (patch) | |
| tree | dbd5fdbe4ec93c48cbba6fec3f608ffefb26eac5 /src/lib/Bcfg2/Client/Tools/YUM.py | |
| parent | 894299b01b6138c54a99fd41f166554d175d6106 (diff) | |
| parent | 4c70626094248495bf2c11c09bf2f2f60917187d (diff) | |
| download | bcfg2-5e0265f837f0eb72123be0b5150451aebdf8b031.tar.gz bcfg2-5e0265f837f0eb72123be0b5150451aebdf8b031.tar.bz2 bcfg2-5e0265f837f0eb72123be0b5150451aebdf8b031.zip | |
Merge remote branch 'upstream/master' into jasons-hacking
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/YUM.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUM.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py index 5d20c0462..928aba1e1 100644 --- a/src/lib/Bcfg2/Client/Tools/YUM.py +++ b/src/lib/Bcfg2/Client/Tools/YUM.py @@ -751,7 +751,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): rescode, restring = self.yumbase.buildTransaction() except yum.Errors.YumBaseError: err = sys.exc_info()[1] - self.logger.error("Yum transaction error: %s" % err) + self.logger.error("Error building Yum transaction: %s" % err) cleanup() return @@ -767,7 +767,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): self.logger.info("Single Pass for Install Succeeded") except yum.Errors.YumBaseError: err = sys.exc_info()[1] - self.logger.error("Yum transaction error: %s" % err) + self.logger.error("Error processing Yum transaction: %s" % err) cleanup() return else: @@ -788,7 +788,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): self.logger.debug(" %s" % restring) except yum.Errors.YumBaseError: err = sys.exc_info()[1] - self.logger.error("Yum transaction error: %s" % err) + self.logger.error("Error rerunning Yum transaction: %s" % err) self.yumbase.conf.skip_broken = skip_broken @@ -850,7 +850,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): if inst not in self.instance_status: self.logger.warning( " Asked to install/update package never " - "verified: %s" % + "verified: %s" % nevra2string(build_yname(pkg.get('name'), inst))) continue status = self.instance_status[inst] |