diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-01-27 05:33:06 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-01-27 05:33:06 +0000 |
| commit | 8d3df13cb2cc24d93c425ba91eb93c11e3a557bc (patch) | |
| tree | 007d049726bb488dc8ac3eba1d512f33d91e2c5a | |
| parent | 977f6207719f8c0470eca1404624784d723bdc4a (diff) | |
| download | anaconda-8d3df13cb2cc24d93c425ba91eb93c11e3a557bc.tar.gz anaconda-8d3df13cb2cc24d93c425ba91eb93c11e3a557bc.tar.xz anaconda-8d3df13cb2cc24d93c425ba91eb93c11e3a557bc.zip | |
use RPMTRANS_FLAG_ANACONDA to get presentation ordering. hopefully base
is back on one cd...
| -rw-r--r-- | packages.py | 6 | ||||
| -rwxr-xr-x | scripts/pkgorder | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages.py b/packages.py index c32713025..8c3dfce78 100644 --- a/packages.py +++ b/packages.py @@ -680,7 +680,7 @@ def doInstall(method, id, intf, instPath): ts = rpm.TransactionSet(instPath) ts.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA)) - ts.setFlags(rpm.RPMTRANS_FLAG_CHAINSAW) + ts.setFlags(rpm.RPMTRANS_FLAG_ANACONDA) total = 0 totalSize = 0 @@ -720,7 +720,7 @@ def doInstall(method, id, intf, instPath): del ts ts = rpm.TransactionSet(instPath) ts.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA)) - ts.setFlags(rpm.RPMTRANS_FLAG_CHAINSAW) + ts.setFlags(rpm.RPMTRANS_FLAG_ANACONDA) i = 0 for p in l: @@ -818,6 +818,7 @@ def doInstall(method, id, intf, instPath): nodeprob = rpm.RPMPROB_DISKNODES for (descr, (type, mount, need)) in problems: + log("(%s, (%s, %s, %s))" %(descr, type, mount, need)) if mount and mount.startswith(instPath): mount = mount[len(instPath):] if not mount: @@ -850,6 +851,7 @@ def doInstall(method, id, intf, instPath): _("Space Needed")) for (mount, need) in spaceneeded.items (): + log("(%s, %s)" %(mount, need)) if need > (1024*1024): need = (need + 1024 * 1024 - 1) / (1024 * 1024) suffix = "M" diff --git a/scripts/pkgorder b/scripts/pkgorder index ff1659553..30a44e9f4 100755 --- a/scripts/pkgorder +++ b/scripts/pkgorder @@ -171,8 +171,8 @@ testpath = '/tmp/pkgorder-' + str (os.getpid ()) 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.setVSFlags(~(rpm.RPMVSF_NORSA|rpm.RPMVSF_NODSA)) +ts.setFlags(rpm.RPMTRANS_FLAG_NOMD5|rpm.RPMTRANS_FLAG_ANACONDA) for h in pkgOrder: #print "in:", h[1000000] ts.addInstall(h, h, 'i') |