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

Diff of /rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch

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

Revision 1.10 by slords, Tue Mar 18 19:44:09 2008 UTC Revision 1.12 by slords, Mon Mar 31 20:07:59 2008 UTC
# Line 47  Line 47 
47    
48          return INSTALL_OK          return INSTALL_OK
49    
50  --- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.smeserver       2006-05-04 13:58:53.000000000 -0600  --- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.sme     2006-05-04 13:58:53.000000000 -0600
51  +++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2007-12-20 14:23:49.000000000 -0700  +++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py 2008-03-31 13:13:42.000000000 -0600
52  @@ -31,88 +31,11 @@  @@ -44,75 +44,24 @@
53           (self.type, self.bootDev) = \               else:
54                       checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath)                   nobl = 1
55            
 -        blradio = RadioGroup()  
 -  
 -        (update, newbl, nobl) = (0, 0, 0)  
 -        if not self.dispatch.stepInSkipList("bootloader"):  
 -            newbl = 1  
 -        elif self.dispatch.stepInSkipList("instbootloader"):  
 -            nobl = 1  
 -        else:  
 -            if self.type is not None and self.bootDev is not None:  
 -                update = 1  
 -            else:  
 -                nobl = 1  
 -          
56  -        if self.type is not None and self.bootDev is not None:  -        if self.type is not None and self.bootDev is not None:
57  -            t = TextboxReflowed(53,  -            t = TextboxReflowed(53,
58  -                                _("The installer has detected the %s boot "  -                                _("The installer has detected the %s boot "
# Line 74  Line 61 
61  -  -
62  -            self.update_radio = blradio.add(_("Update boot loader configuration"),  -            self.update_radio = blradio.add(_("Update boot loader configuration"),
63  -                                            "update", update)  -                                            "update", update)
64  -        else:  +        if nobl == 1:
65    +            self.dispatch.skipStep("bootloadersetup", skip = 1)
66    +            self.dispatch.skipStep("bootloader", skip = 1)
67    +            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
68    +            self.dispatch.skipStep("instbootloader", skip = 1)
69    +        elif newbl == 1:
70    +            self.dispatch.skipStep("bootloadersetup", skip = 0)
71    +            self.dispatch.skipStep("bootloader", skip = 1)
72    +            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
73    +            self.dispatch.skipStep("instbootloader", skip = 0)
74    +            self.bl.doUpgradeOnly = 0
75             else:
76  -            t = TextboxReflowed(53,  -            t = TextboxReflowed(53,
77  -                  _("The installer is unable to detect the boot loader "  -                  _("The installer is unable to detect the boot loader "
78  -                    "currently in use on your system."))  -                    "currently in use on your system."))
# Line 135  Line 133 
133  -                self.bl.setDevice(self.bootDev)  -                self.bl.setDevice(self.bootDev)
134  -  -
135  -  -
136  -  +            self.dispatch.skipStep("bootloadersetup", skip = 0)
137    +            self.dispatch.skipStep("bootloader", skip = 1)
138    +            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
139    +            self.dispatch.skipStep("instbootloader", skip = 0)
140    +            self.bl.doUpgradeOnly = 1
141    +            self.bl.useGrubVal = 1
142    +            self.bl.setDevice(self.bootDev)
143    
144  -            screen.popWindow()  -            screen.popWindow()
145  -            return INSTALL_OK  -            return INSTALL_OK
 +        self.dispatch.skipStep("bootloadersetup", skip = 0)  
 +        self.dispatch.skipStep("bootloader", skip = 1)  
 +        self.dispatch.skipStep("bootloaderadvanced", skip = 1)  
 +        self.dispatch.skipStep("instbootloader", skip = 0)  
 +        self.bl.doUpgradeOnly = 1  
 +        self.bl.useGrubVal = 1  
 +        self.bl.setDevice(self.bootDev)  
146  +        return INSTALL_OK  +        return INSTALL_OK
147  --- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver  2007-01-22 16:14:06.000000000 -0700  --- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver  2007-01-22 16:14:06.000000000 -0700
148  +++ anaconda-11.1.2.87/textw/upgrade_text.py    2007-12-20 13:59:27.000000000 -0700  +++ anaconda-11.1.2.87/textw/upgrade_text.py    2007-12-20 13:59:27.000000000 -0700
# Line 578  Line 576 
576               n, a, e, v, r = pkgtup               n, a, e, v, r = pkgtup
577               if supportedUpgradeVersion <= 0:               if supportedUpgradeVersion <= 0:
578  -                val = rpmUtils.miscutils.compareEVR((None, '3', '1'),  -                val = rpmUtils.miscutils.compareEVR((None, '3', '1'),
579  +                val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'),  +                val = rpmUtils.miscutils.compareEVR(('26', '7.0', '01'),
580                                                       (e, v,r))                                                       (e, v,r))
581                   if val > 0:                   if val > 0:
582                       supportedUpgradeVersion = 0                       supportedUpgradeVersion = 0

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