summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-10-10 14:16:23 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-10-10 14:16:23 +0000
commit18e70fcfc4e47d91126430e61683882818968327 (patch)
tree993527e748bf16a8661ef185eed046759d1faaa8 /src/lib
parentd49ec0cce12b8da989b7efe75d612b0421155f63 (diff)
downloadbcfg2-18e70fcfc4e47d91126430e61683882818968327.tar.gz
bcfg2-18e70fcfc4e47d91126430e61683882818968327.tar.bz2
bcfg2-18e70fcfc4e47d91126430e61683882818968327.zip
Move apt-get update call (in -k mode) to Install, so that changes to sources.list get immediately used for package installs
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3785 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Client/Tools/APT.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py
index 3300a8b04..64db32ad6 100644
--- a/src/lib/Client/Tools/APT.py
+++ b/src/lib/Client/Tools/APT.py
@@ -25,11 +25,6 @@ class APT(Bcfg2.Client.Tools.PkgTool):
Bcfg2.Client.Tools.PkgTool.__init__(self, logger, cfg, setup, states)
self.cfg = cfg
os.environ["DEBIAN_FRONTEND"] = 'noninteractive'
- if not self.setup['dryrun']:
- if self.setup['kevlar']:
- self.cmd.run("dpkg --force-confold --configure --pending")
- self.cmd.run("apt-get clean")
- self.cmd.run("apt-get -q=2 -y update")
self.installed = {}
self.RefreshPackages()
@@ -99,4 +94,10 @@ class APT(Bcfg2.Client.Tools.PkgTool):
self.RefreshPackages()
self.extra = self.FindExtraPackages()
-
+ def Install(self, packages):
+ if not self.setup['dryrun']:
+ if self.setup['kevlar']:
+ self.cmd.run("dpkg --force-confold --configure --pending")
+ self.cmd.run("apt-get clean")
+ self.cmd.run("apt-get -q=2 -y update")
+ Bcfg2.Client.Tools.PkgTool.Install(self, packages)