/[smeserver]/rpms/anaconda/sme8/anaconda-centos-regkey.patch
ViewVC logotype

Diff of /rpms/anaconda/sme8/anaconda-centos-regkey.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by slords, Tue Jun 12 17:57:22 2007 UTC Revision 1.2 by slords, Tue Jun 24 15:37:10 2008 UTC
# Line 1  Line 1 
1  diff -uNr anaconda-11.1.2.36__orig/packages.py anaconda-11.1.2.36/packages.py  diff -uNr anaconda-11.1.2.87__orig/installclasses/rhel.py anaconda-11.1.2.87/installclasses/rhel.py
2  --- anaconda-11.1.2.36__orig/packages.py        2007-01-26 21:50:31.000000000 +0000  --- anaconda-11.1.2.87__orig/installclasses/rhel.py     2008-06-15 03:50:44.000000000 +0100
3  +++ anaconda-11.1.2.36/packages.py      2007-03-29 21:49:24.000000000 +0000  +++ anaconda-11.1.2.87/installclasses/rhel.py   2008-06-15 03:51:26.000000000 +0100
4  @@ -266,38 +266,6 @@  @@ -73,7 +73,7 @@
5           def setSteps(self, dispatch):
6       key = anaconda.id.instClass.installkey or ""          BaseInstallClass.setSteps(self, dispatch);
7            dispatch.skipStep("partition")
8    -       dispatch.skipStep("regkey", skip = 0)        
9    +       dispatch.skipStep("regkey", skip = 1)        
10    
11  -    # handle existing key if we're headed forward       def handleRegKey(self, key, intf, interactive = True):
12  -    if key and not anaconda.id.instClass.skipkey and \           self.repopaths = { "base": "%s" %(productPath,) }
 -       anaconda.dir == DISPATCH_FORWARD and checkRegKey(anaconda, key):  
 -        return DISPATCH_FORWARD  
 -  
 -    # if we're backing up we should allow them to reconsider skipping the key  
 -    if anaconda.dir == DISPATCH_BACK and anaconda.id.instClass.skipkey:  
 -        anaconda.id.instClass.skipkey = False  
 -  
 -    while not anaconda.id.instClass.skipkey:  
 -        rc = anaconda.intf.getInstallKey(anaconda, key)  
 -        if rc is None and anaconda.dispatch.canGoBack():  
 -            return DISPATCH_BACK  
 -        elif rc is None:  
 -            continue  
 -        elif rc == SKIP_KEY:  
 -            if anaconda.id.instClass.skipkeytext:  
 -                rc = anaconda.intf.messageWindow(_("Skip"),  
 -                                     _(anaconda.id.instClass.skipkeytext),  
 -                                     type="custom", custom_icon="question",  
 -                                     custom_buttons=[_("_Back"), _("_Skip")])  
 -                if not rc:  
 -                    continue  
 -                # unset the key and associated data  
 -                checkRegKey(anaconda, None, quiet=1)  
 -                anaconda.id.instClass.skipkey = True  
 -            break  
 -  
 -        key = rc  
 -        if checkRegKey(anaconda, key):  
 -            break  
 -  
      return DISPATCH_FORWARD  
   
  def betaNagScreen(anaconda):  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed