diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-04-11 14:17:05 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-04-11 14:17:05 +0000 |
| commit | 11156d9ce16cb4ccb263a71e6b34309e919b1c75 (patch) | |
| tree | 554a3451be04a833f588befdd11753cca05820a1 /partitioning.py | |
| parent | 6989a7476fbd288203774883590635172c15adc6 (diff) | |
| download | anaconda-11156d9ce16cb4ccb263a71e6b34309e919b1c75.tar.gz anaconda-11156d9ce16cb4ccb263a71e6b34309e919b1c75.tar.xz anaconda-11156d9ce16cb4ccb263a71e6b34309e919b1c75.zip | |
2005-04-11 Jeremy Katz <katzj@redhat.com>
* partitioning.py (partitioningComplete): Don't try to do
early swap in test mode and use yesno instead of okcancel (msw)
Diffstat (limited to 'partitioning.py')
| -rw-r--r-- | partitioning.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/partitioning.py b/partitioning.py index daac59f28..b0ca08e1a 100644 --- a/partitioning.py +++ b/partitioning.py @@ -100,7 +100,8 @@ def partitioningComplete(bl, fsset, diskSet, partitions, intf, instPath, dir): raise RuntimeError, ("Managed to not get an entry back from " "request.toEntry") - if iutil.memAvailable() > isys.EARLY_SWAP_RAM: + if (not flags.setupFilesystems + or iutil.memAvailable() > isys.EARLY_SWAP_RAM): return # XXX this attribute is probably going away @@ -110,7 +111,7 @@ def partitioningComplete(bl, fsset, diskSet, partitions, intf, instPath, dir): "machine, we need to turn on swap space " "immediately. To do this we'll have to " "write your new partition table to the disk " - "immediately. Is that OK?"), "okcancel") + "immediately. Is that OK?"), "yesno") else: rc = 1 |