diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
| commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
| tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /src/lib/Client/Tools/Pacman.py | |
| parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
| parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
| download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip | |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
Diffstat (limited to 'src/lib/Client/Tools/Pacman.py')
| -rw-r--r-- | src/lib/Client/Tools/Pacman.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/Pacman.py b/src/lib/Client/Tools/Pacman.py index 082897934..c8c05061c 100644 --- a/src/lib/Client/Tools/Pacman.py +++ b/src/lib/Client/Tools/Pacman.py @@ -78,5 +78,6 @@ class Pacman(Bcfg2.Client.Tools.PkgTool): try: self.logger.debug("Running : %s -S %s" % (self.pkgtool, pkgline)) self.cmd.run("%s -S %s" % (self.pkgtool, pkgline)) - except Exception, e: + except Exception: + e = sys.exc_info()[1] self.logger.error("Error occurred during installation: %s" % e) |