diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-10-24 18:29:19 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-10-24 18:29:19 +0000 |
| commit | abb8921fe4e52e050a29bf971fe1d51e2d5a6959 (patch) | |
| tree | 5f4b395bae5550a6abf667b162a470bbf5c7ffb8 | |
| parent | fee16d400b930e149757bbf3f5c5b7bf040287ab (diff) | |
| download | anaconda-abb8921fe4e52e050a29bf971fe1d51e2d5a6959.tar.gz anaconda-abb8921fe4e52e050a29bf971fe1d51e2d5a6959.tar.xz anaconda-abb8921fe4e52e050a29bf971fe1d51e2d5a6959.zip | |
to chainsaw for now -- ordering seems to fail for the not chainsaw case
| -rw-r--r-- | packages.py | 5 | ||||
| -rwxr-xr-x | scripts/pkgorder | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages.py b/packages.py index 515345fdc..bfb68a0bf 100644 --- a/packages.py +++ b/packages.py @@ -627,7 +627,7 @@ def doInstall(method, id, intf, instPath): ts = rpm.TransactionSet(instPath) ts.setVSFlags(~rpm.RPMVSF_NORSA|~rpm.RPMVSF_NODSA) - ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|~rpm.RPMTRANS_FLAG_CHAINSAW) + ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|rpm.RPMTRANS_FLAG_CHAINSAW) total = 0 totalSize = 0 @@ -724,7 +724,6 @@ def doInstall(method, id, intf, instPath): problems = ts.run(cb.cb, 0) if problems: - # restore old fstab if we did anything for migrating if upgrade: id.fsset.restoreMigratedFstab(instPath) @@ -809,7 +808,7 @@ def doInstall(method, id, intf, instPath): # rpm.errorSetCallback (oldError) method.filesDone () - + if upgrade: instLog.write(_("\n\nThe following packages were available in " "this version but NOT upgraded:\n")) diff --git a/scripts/pkgorder b/scripts/pkgorder index 1ffa98dfd..5dab48fd8 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -172,7 +172,7 @@ os.system ("mkdir -p " + testpath + "/var/lib/rpm") ts = rpm.TransactionSet(testpath) ts.setVSFlags(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA) -ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|~rpm.RPMTRANS_FLAG_CHAINSAW) +ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|rpm.RPMTRANS_FLAG_CHAINSAW) for h in pkgOrder: #print "in:", h[1000000] ts.addInstall(h, h, 'i') |