summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-10-26 18:08:23 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-10-26 18:08:23 +0000
commitbc5115232522cadd2543e4120b74d50452fcd526 (patch)
treed17e1917620aae5b0395f58255a979b9a3f77727
parent76c6b1e2ca3fcb335c4fcc1d573e7006091b74ec (diff)
downloadbcfg2-bc5115232522cadd2543e4120b74d50452fcd526.tar.gz
bcfg2-bc5115232522cadd2543e4120b74d50452fcd526.tar.bz2
bcfg2-bc5115232522cadd2543e4120b74d50452fcd526.zip
do nonpkg stuff first on debian
(Logical change 1.117) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@517 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Client/Debian.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Client/Debian.py b/src/lib/Client/Debian.py
index 57c2a347e..0c2d10faf 100644
--- a/src/lib/Client/Debian.py
+++ b/src/lib/Client/Debian.py
@@ -144,6 +144,11 @@ class Debian(Toolset):
count = count + 1
old = left
packages = [x for x in work if x.tag == 'Package']
+
+ for nonpkg in [x for x in work if x.tag != 'Package']:
+ self.InstallEntry(nonpkg)
+ if self.states[nonpkg]:
+ work.remove(nonpkg)
# try single large install
rc = system(cmd % " ".join(["%s=%s" % (x.get('name'), x.get('version', 'dummy')) for x in packages]))
@@ -171,9 +176,4 @@ class Debian(Toolset):
else:
print "Failed to install package %s" % (pkg.get('name'))
- for nonpkg in [x for x in work if x.tag != 'Package']:
- self.InstallEntry(nonpkg)
- if self.states[nonpkg]:
- work.remove(nonpkg)
-
left = len(work)