summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-10-09 19:05:31 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-10-09 19:05:31 +0000
commit9e854810496cbc169f0e6632eb197046c438af0e (patch)
tree74b3da31b43d1580662efde3becd2c5dbb262fb6 /src
parentb7c73417f728237e8d8957a0746acad5f11b8e97 (diff)
downloadbcfg2-9e854810496cbc169f0e6632eb197046c438af0e.tar.gz
bcfg2-9e854810496cbc169f0e6632eb197046c438af0e.tar.bz2
bcfg2-9e854810496cbc169f0e6632eb197046c438af0e.zip
Fix apt problems again
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2418 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Frame.py1
-rw-r--r--src/lib/Client/Tools/APT.py6
2 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index dd1e98008..be05e878e 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -32,7 +32,6 @@ class Frame:
tool_class = "Bcfg2.Client.Tools.%s" % tool
mod = __import__(tool_class, globals(), locals(), ['*'])
except ImportError:
- print "Failed to import module %s" % (tool)
continue
try:
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py
index 222320aed..a4e940cf8 100644
--- a/src/lib/Client/Tools/APT.py
+++ b/src/lib/Client/Tools/APT.py
@@ -1,14 +1,10 @@
'''This is the bcfg2 support for apt-get'''
__revision__ = '$Revision$'
+import apt_pkg
import os, re
import Bcfg2.Client.Tools
-try:
- import apt_pkg
-except ImportError:
- raise Bcfg2.Client.Tools.toolInstantiationError
-
class APT(Bcfg2.Client.Tools.PkgTool):
'''The Debian toolset implements package and service operations and inherits
the rest from Toolset.Toolset'''