| 1 |
slords |
1.1 |
diff -uNr anaconda-11.1.2.36__orig/packages.py anaconda-11.1.2.36/packages.py |
| 2 |
|
|
--- anaconda-11.1.2.36__orig/packages.py 2007-01-26 21:50:31.000000000 +0000 |
| 3 |
|
|
+++ anaconda-11.1.2.36/packages.py 2007-03-29 21:49:24.000000000 +0000 |
| 4 |
|
|
@@ -266,38 +266,6 @@ |
| 5 |
|
|
|
| 6 |
|
|
key = anaconda.id.instClass.installkey or "" |
| 7 |
|
|
|
| 8 |
|
|
- # handle existing key if we're headed forward |
| 9 |
|
|
- if key and not anaconda.id.instClass.skipkey and \ |
| 10 |
|
|
- anaconda.dir == DISPATCH_FORWARD and checkRegKey(anaconda, key): |
| 11 |
|
|
- return DISPATCH_FORWARD |
| 12 |
|
|
- |
| 13 |
|
|
- # if we're backing up we should allow them to reconsider skipping the key |
| 14 |
|
|
- if anaconda.dir == DISPATCH_BACK and anaconda.id.instClass.skipkey: |
| 15 |
|
|
- anaconda.id.instClass.skipkey = False |
| 16 |
|
|
- |
| 17 |
|
|
- while not anaconda.id.instClass.skipkey: |
| 18 |
|
|
- rc = anaconda.intf.getInstallKey(anaconda, key) |
| 19 |
|
|
- if rc is None and anaconda.dispatch.canGoBack(): |
| 20 |
|
|
- return DISPATCH_BACK |
| 21 |
|
|
- elif rc is None: |
| 22 |
|
|
- continue |
| 23 |
|
|
- elif rc == SKIP_KEY: |
| 24 |
|
|
- if anaconda.id.instClass.skipkeytext: |
| 25 |
|
|
- rc = anaconda.intf.messageWindow(_("Skip"), |
| 26 |
|
|
- _(anaconda.id.instClass.skipkeytext), |
| 27 |
|
|
- type="custom", custom_icon="question", |
| 28 |
|
|
- custom_buttons=[_("_Back"), _("_Skip")]) |
| 29 |
|
|
- if not rc: |
| 30 |
|
|
- continue |
| 31 |
|
|
- # unset the key and associated data |
| 32 |
|
|
- checkRegKey(anaconda, None, quiet=1) |
| 33 |
|
|
- anaconda.id.instClass.skipkey = True |
| 34 |
|
|
- break |
| 35 |
|
|
- |
| 36 |
|
|
- key = rc |
| 37 |
|
|
- if checkRegKey(anaconda, key): |
| 38 |
|
|
- break |
| 39 |
|
|
- |
| 40 |
|
|
return DISPATCH_FORWARD |
| 41 |
|
|
|
| 42 |
|
|
def betaNagScreen(anaconda): |
Parent Directory
| 
Revision Log
| 
Revision Graph
