diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2005-10-24 21:22:15 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2005-10-24 21:22:15 +0000 |
commit | 01d14814e43fdf4de4f5d467a5d3c116c458d3a6 (patch) | |
tree | 9e772859ab06b007571fb9db6b23f9c8d5e0ef7d /src/lib | |
parent | 7a1c232c561d1e5588d48c82efd4bdf566965b84 (diff) | |
download | bcfg2-01d14814e43fdf4de4f5d467a5d3c116c458d3a6.tar.gz bcfg2-01d14814e43fdf4de4f5d467a5d3c116c458d3a6.tar.bz2 bcfg2-01d14814e43fdf4de4f5d467a5d3c116c458d3a6.zip |
pylint fixes
remove duped code
(Logical change 1.343)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1419 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Client/Debian.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py index d05abcbe5..75fa1ef65 100644 --- a/src/lib/Client/Debian.py +++ b/src/lib/Client/Debian.py @@ -3,12 +3,11 @@ __revision__ = '$Revision$' from glob import glob from os import environ, stat, system -from popen2 import Popen4 from re import compile as regcompile import apt_pkg -from Bcfg2.Client.Toolset import Toolset +from Bcfg2.Client.Toolset import Toolset, saferun class Debian(Toolset): '''The Debian toolset implements package and service operations and inherits @@ -90,13 +89,7 @@ class Debian(Toolset): if self.installed.has_key(entry.attrib['name']): if self.installed[entry.attrib['name']] == entry.attrib['version']: if not self.setup['quick']: - cmd = Popen4("debsums -s %s"%(entry.attrib['name'])) - cstat = cmd.poll() - output = cmd.fromchild.read() - while cstat == -1: - output += cmd.fromchild.read() - cstat = cmd.poll() - output = [line for line in output.split('\n') if line] + output = saferun("debsums -s %s" % entry.get('name'))[1] if [filename for filename in output if filename not in modlist]: return False return True |