/[smeserver]/rpms/anaconda/sme7/smeserver.patch
ViewVC logotype

Contents of /rpms/anaconda/sme7/smeserver.patch

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


Revision 1.2 - (show annotations) (download)
Sat Dec 1 03:37:31 2007 UTC (16 years, 6 months ago) by slords
Branch: MAIN
Changes since 1.1: +10 -10 lines
Import on branch sme7 of package anaconda-10.1.1.81-1.centos4.1.el4.sme.src.rpm

1 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/bootloader.py mezzanine_patched_anaconda-10.1.1.37/bootloader.py
2 --- anaconda-10.1.1.37/bootloader.py 2005-04-22 22:06:17.000000000 +1000
3 +++ mezzanine_patched_anaconda-10.1.1.37/bootloader.py 2006-04-06 06:43:38.459411580 +1000
4 @@ -185,11 +185,6 @@
5 except BootyNoKernelWarning:
6 if not justConfigFile:
7 w.pop()
8 - if intf:
9 - intf.messageWindow(_("Warning"),
10 - _("No kernel packages were installed on your "
11 - "system. Your boot loader configuration "
12 - "will not be changed."))
13 dosync()
14
15 # note that this function no longer actually creates an initrd.
16 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/findpackageset.py mezzanine_patched_anaconda-10.1.1.37/findpackageset.py
17 --- anaconda-10.1.1.37/findpackageset.py 2005-02-08 11:42:45.000000000 +1100
18 +++ mezzanine_patched_anaconda-10.1.1.37/findpackageset.py 2006-04-06 06:44:04.715849054 +1000
19 @@ -108,21 +108,15 @@
20 # loop through packages and find ones which are a newer
21 # version than what we have
22 for ( name, arch ) in instDict.keys():
23 - if ( name, arch ) in availDict.keys():
24 - # Exact arch upgrade
25 - h = instDict[(name, arch)]
26 - pkg = availDict[(name,arch)]
27 - comparePackageForUpgrade(updDict, h, pkg)
28 - else:
29 - # See if we have a better arch than that installed
30 - if name in availNames.keys():
31 - bestarch = findBestArch(availNames[name])
32 - if not bestarch:
33 - continue
34 - if availDict.has_key((name,bestarch)):
35 - h = instDict[(name,arch)]
36 - pkg = availDict[(name,bestarch)]
37 - comparePackageForUpgrade(updDict, h, pkg)
38 + # See if we have a better arch than that installed
39 + if name in availNames.keys():
40 + bestarch = findBestArch(availNames[name])
41 + if not bestarch:
42 + continue
43 + if availDict.has_key((name,bestarch)):
44 + h = instDict[(name,arch)]
45 + pkg = availDict[(name,bestarch)]
46 + comparePackageForUpgrade(updDict, h, pkg)
47
48 # handle obsoletes
49 for pkg in hdlist:
50 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py
51 --- anaconda-10.1.1.37/instdata.py 2004-08-25 23:12:10.000000000 +1000
52 +++ mezzanine_patched_anaconda-10.1.1.37/instdata.py 2006-04-06 06:44:44.401953223 +1000
53 @@ -116,10 +116,7 @@
54
55 def write(self, instPath):
56 self.langSupport.write (instPath)
57 -
58 - if not self.isHeadless:
59 - self.keyboard.write (instPath)
60 -
61 + self.keyboard.write (instPath)
62 self.timezone.write (instPath)
63 self.auth.write (instPath)
64 self.firewall.write (instPath)
65 @@ -172,8 +169,8 @@
66
67 self.instLanguage.writeKS(f)
68 self.langSupport.writeKS(f)
69 + self.keyboard.writeKS(f)
70 if not self.isHeadless:
71 - self.keyboard.writeKS(f)
72 self.xsetup.writeKS(f, self.desktop)
73 self.network.writeKS(f)
74 self.zfcp.writeKS(f)
75 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/kickstart.py mezzanine_patched_anaconda-10.1.1.37/kickstart.py
76 --- anaconda-10.1.1.37/kickstart.py 2006-04-06 06:59:28.404442287 +1000
77 +++ mezzanine_patched_anaconda-10.1.1.37/kickstart.py 2006-04-06 06:45:23.609141002 +1000
78 @@ -99,6 +99,17 @@
79 name = "kickstart"
80
81 def postAction(self, rootPath, serial, intf):
82 + win = intf.waitWindow(_("Post Install Script"),
83 + _("The post installation script is running..."))
84 +
85 + script = ( "/sbin/syslogd &\n"
86 + "sleep 2\n"
87 + "/sbin/e-smith/signal-event post-install\n" )
88 + s = Script(script, interp="/bin/sh", inChroot=1)
89 + log("%s", s)
90 + s.run(rootPath, serial)
91 + win.pop()
92 +
93 log("Running kickstart %%post script(s)")
94 for script in self.postScripts:
95 script.run(rootPath, serial)
96 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/lang-table mezzanine_patched_anaconda-10.1.1.37/lang-table
97 --- anaconda-10.1.1.37/lang-table 2004-10-25 22:38:22.000000000 +1000
98 +++ mezzanine_patched_anaconda-10.1.1.37/lang-table 2006-04-06 06:46:15.455133408 +1000
99 @@ -1,41 +1,5 @@
100 -Arabic ar none ar_SA.UTF-8 us Asia/Riyadh ar_SA.UTF-8
101 -Bengali bn none bn_BD.UTF-8 us Asia/Dhaka bn_BD.UTF-8
102 -Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta bn_IN.UTF-8
103 -Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia bg_BG.UTF-8
104 -Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid es_ES.UTF-8
105 -Chinese(Simplified) zh_CN bterm zh_CN.UTF-8 us Asia/Shanghai zh_CN.UTF-8
106 -Chinese(Traditional) zh_TW bterm zh_TW.UTF-8 us Asia/Taipei zh_TW.UTF-8
107 -Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb hr_HR.UTF-8
108 -Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague cs_CZ.UTF-8
109 -Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen da_DK.UTF-8
110 -Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam nl_NL.UTF-8
111 +Deutsch de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8
112 English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York en_US.UTF-8
113 -Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn et_EE.UTF-8
114 -Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki fi_FI.UTF-8
115 -French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8
116 -German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin de_DE.UTF-8
117 -Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta gu_IN.UTF-8
118 -Hindi hi none hi_IN.UTF-8 us Asia/Calcutta hi_IN.UTF-8
119 -Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest hu_HU.UTF-8
120 -Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik is_IS.UTF-8
121 -Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8
122 -Japanese ja bterm ja_JP.UTF-8 jp106 Asia/Tokyo ja_JP.UTF-8
123 -Korean ko bterm ko_KR.UTF-8 us Asia/Seoul ko_KR.UTF-8
124 -Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje mk_MK.UTF-8
125 -Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur ms_MY.UTF-8
126 -Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo nb_NO.UTF-8
127 -Persian fa none fa_IR.UTF-8 us Asia/Tehran fa_IR.UTF-8
128 -Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl Europe/Warsaw pl_PL.UTF-8
129 -Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon pt_PT.UTF-8
130 -Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo pt_BR.UTF-8
131 -Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta pa_IN.UTF-8
132 -Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow ru_RU.UTF-8
133 -Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana sl_SI.UTF-8
134 -Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8
135 -Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm sv_SE.UTF-8
136 -Tamil ta none ta_IN.UTF-8 us Asia/Calcutta ta_IN.UTF-8
137 -Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul tr_TR.UTF-8
138 -Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev uk_UA.UTF-8
139 -Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon vi_VN.UTF-8
140 -Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London cy_GB.UTF-8
141 -Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg zu_ZA.UTF-8
142 +Español es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid es_ES.UTF-8
143 +Français fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris fr_FR.UTF-8
144 +Italiano it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome it_IT.UTF-8
145 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/partedUtils.py mezzanine_patched_anaconda-10.1.1.37/partedUtils.py
146 --- anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:59:28.175482025 +1000
147 +++ mezzanine_patched_anaconda-10.1.1.37/partedUtils.py 2006-04-06 06:47:31.309955789 +1000
148 @@ -454,8 +454,8 @@
149 return None
150
151 def getCentOSReleaseString(mountpoint):
152 - if os.access(mountpoint + "/etc/redhat-release", os.R_OK):
153 - f = open(mountpoint + "/etc/redhat-release", "r")
154 + if os.access(mountpoint + "/etc/e-smith-release", os.R_OK):
155 + f = open(mountpoint + "/etc/e-smith-release", "r")
156 try:
157 lines = f.readlines()
158 except IOError:
159 @@ -497,6 +497,7 @@
160 return 1
161
162 productUpgrades = {
163 + "SME Server": ("Mitel Networks", "SME Server", ),
164 "Red Hat Enterprise Linux AS": ("Red Hat Linux Advanced Server", ),
165 "Red Hat Enterprise Linux WS": ("Red Hat Linux Advanced Workstation",),
166 # FIXME: this probably shouldn't be in a release...
167 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/installpath_text.py mezzanine_patched_anaconda-10.1.1.37/textw/installpath_text.py
168 --- anaconda-10.1.1.37/textw/installpath_text.py 2003-04-22 07:21:24.000000000 +1000
169 +++ mezzanine_patched_anaconda-10.1.1.37/textw/installpath_text.py 2006-04-06 06:56:41.641388290 +1000
170 @@ -45,12 +45,12 @@
171 if orig != None:
172 default = orig
173
174 - (button, choice) = ListboxChoiceWindow(screen, _("Installation Type"),
175 - _("What type of system would you like to install?"),
176 - choices, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON],
177 - width = 40, default = default, help = "installpath")
178 + choice = default
179 + rc = intf.messageWindow(_("Warning"),
180 + _("All disks will be reformatted and any data will be lost. Proceed?"),
181 + type = "yesno", default = "no")
182
183 - if button == TEXT_BACK_CHECK:
184 + if rc == 0:
185 return INSTALL_BACK
186
187 if (choice != orig):
188 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/language_text.py mezzanine_patched_anaconda-10.1.1.37/textw/language_text.py
189 --- anaconda-10.1.1.37/textw/language_text.py 2004-09-14 01:12:37.000000000 +1000
190 +++ mezzanine_patched_anaconda-10.1.1.37/textw/language_text.py 2006-04-06 06:53:37.317389387 +1000
191 @@ -91,85 +91,12 @@
192
193 class LanguageSupportWindow:
194 def __call__(self, screen, language):
195 -
196 - # should already be sorted
197 - ct = CheckboxTree(height = 8, scroll = 1)
198 -
199 - for lang in language.getAllSupported():
200 - ct.append(lang, lang, 0)
201 -
202 - for lang in language.getSupported ():
203 - ct.setEntryValue(lang, 1)
204 -
205 - current = language.getDefault()
206 - ct.setCurrent(current)
207 - ct.setEntryValue(current, 1)
208 -
209 - bb = ButtonBar (screen, (TEXT_OK_BUTTON, (_("Select All"), "all"), (_("Reset"), "reset"), TEXT_BACK_BUTTON))
210 -
211 - message = (_("Choose additional languages that you would like to use "
212 - "on this system:"))
213 - tb = TextboxReflowed(50, message)
214 -
215 - g = GridFormHelp (screen, _("Language Support"), "langsupport", 1, 4)
216 -
217 - g.add (tb, 0, 0, (0, 0, 0, 1), anchorLeft = 1)
218 - g.add (ct, 0, 1, (0, 0, 0, 1))
219 - g.add (bb, 0, 3, growx = 1)
220 -
221 - while 1:
222 - result = g.run()
223 -
224 - rc = bb.buttonPressed (result)
225 -
226 - if rc == TEXT_BACK_CHECK:
227 - screen.popWindow()
228 - return INSTALL_BACK
229 -
230 - if rc == "all":
231 - for lang in language.getAllSupported():
232 - ct.setEntryValue(lang, 1)
233 -
234 - if rc == "reset":
235 - for lang in language.getAllSupported():
236 - if lang == current:
237 - ct.setEntryValue(lang, 1)
238 - else:
239 - ct.setEntryValue(lang, 0)
240 -
241 - if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
242 - # --If they selected all langs, then set language.setSupported to
243 - # None. This installs all langs
244 -
245 - if ct.getSelection() == []:
246 - ButtonChoiceWindow(screen, _("Invalid Choice"),
247 - _("You must select at least one language to install."),
248 - buttons = [ TEXT_OK_BUTTON ], width = 40)
249 -
250 - else:
251 - # set selected langs once
252 - language.setSupported (ct.getSelection())
253 -
254 - # we may need to reset the default language
255 - default = language.getDefault()
256 - if default not in ct.getSelection():
257 - sellangs = language.getSupported()
258 -
259 - if len(sellangs) > 0:
260 - language.setDefault(sellangs[0])
261 - else:
262 - language.setDefault(None)
263 -
264 - else:
265 - language.setDefault(default)
266 -
267 - # now set new selected langs again in case old default
268 - # lang was left in the list before we switched the default
269 - language.setSupported (ct.getSelection())
270 -
271 - screen.popWindow()
272 - return INSTALL_OK
273 -
274 + langs = []
275 + default = language.getDefault()
276 + langs.append(default)
277 + language.setSupported(langs)
278 + language.setDefault(default)
279 + return INSTALL_OK
280
281 class LanguageDefaultWindow:
282 def __call__(self,screen, language):
283 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/progress_text.py mezzanine_patched_anaconda-10.1.1.37/textw/progress_text.py
284 --- anaconda-10.1.1.37/textw/progress_text.py 2003-10-08 08:05:01.000000000 +1000
285 +++ mezzanine_patched_anaconda-10.1.1.37/textw/progress_text.py 2006-04-06 06:54:35.803234655 +1000
286 @@ -103,8 +103,8 @@
287
288 currow = 0
289
290 - width = 47 + max (len (name), len (size), len (sum))
291 - self.name = Label(" " * 48)
292 + width = 60 + max (len (name), len (size), len (sum))
293 + self.name = Label(" " * 59)
294 self.size = Label(" ")
295 detail = Grid(2, 2)
296 detail.setField(Label(name), 0, 0, anchorLeft = 1)
297 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/timezone_text.py mezzanine_patched_anaconda-10.1.1.37/textw/timezone_text.py
298 --- anaconda-10.1.1.37/textw/timezone_text.py 2004-05-12 08:29:07.000000000 +1000
299 +++ mezzanine_patched_anaconda-10.1.1.37/textw/timezone_text.py 2006-04-06 06:56:03.241054486 +1000
300 @@ -48,8 +48,7 @@
301 args = [ "/usr/sbin/hwclock" ]
302
303 args.append("--hctosys")
304 - if self.c.selected():
305 - args.append("--utc")
306 + args.append("--utc")
307
308 iutil.execWithRedirect(args[0], args)
309 self.g.setTimer(500)
310 @@ -91,14 +90,12 @@
311 self.l.setCurrent(default)
312 # self.l.setCallback(self.updateClock)
313
314 - self.c = Checkbox("System clock uses UTC", isOn = asUtc)
315 # self.c.setCallback(self.updateSysClock)
316
317 self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone",
318 1, 5)
319 self.g.add(t, 0, 0)
320 # self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1)
321 - self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1)
322 self.g.add(self.l, 0, 3, padding = (0, 0, 0, 1))
323 self.g.add(bb, 0, 4, growx = 1)
324
325 @@ -126,7 +123,7 @@
326 break
327
328 screen.popWindow()
329 - timezone.setTimezoneInfo(self.l.current(), asUtc = self.c.selected())
330 + timezone.setTimezoneInfo(self.l.current(), asUtc = 1)
331
332 return INSTALL_OK
333
334 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/textw/upgrade_text.py mezzanine_patched_anaconda-10.1.1.37/textw/upgrade_text.py
335 --- anaconda-10.1.1.37/textw/upgrade_text.py 2004-08-19 02:34:08.000000000 +1000
336 +++ mezzanine_patched_anaconda-10.1.1.37/textw/upgrade_text.py 2006-04-06 06:59:04.069665851 +1000
337 @@ -20,8 +20,8 @@
338 from fsset import *
339 from flags import flags
340 from constants import *
341 -import upgradeclass
342 -UpgradeClass = upgradeclass.InstallClass
343 +import smeupgradeclass
344 +UpgradeClass = smeupgradeclass.InstallClass
345
346 from rhpl.log import log
347 from rhpl.translate import _
348 @@ -196,26 +196,19 @@
349 else:
350 scroll = 0
351 partList = []
352 - partList.append(_("Reinstall System"))
353 + partList.append(_("Erase ALL disks, and perform a fresh install"))
354
355 for (drive, fs, desc) in parts:
356 - if drive[:5] != "/dev/":
357 - devname = "/dev/" + drive
358 - else:
359 - devname = drive
360 - partList.append("%s (%s)" %(desc, drive))
361 + partList.append("Upgrade existing \"%s\" system" %(desc))
362
363 (button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"),
364 - _("One or more existing Linux installations "
365 - "have been found "
366 - "on your system.\n\nPlease choose one to upgrade, "
367 - "or select 'Reinstall System' to freshly install "
368 - "your system."), partList,
369 + _("Your system is upgradeable."), partList,
370 [ TEXT_OK_BUTTON,
371 TEXT_BACK_BUTTON ],
372 width = 55, scroll = scroll,
373 height = height,
374 - help = "upgraderoot")
375 + help = "upgraderoot",
376 + default = 1)
377
378 if button == TEXT_BACK_CHECK:
379 return INSTALL_BACK
380 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py
381 --- anaconda-10.1.1.37/upgrade.py 2006-04-06 06:59:28.387445237 +1000
382 +++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py 2006-04-06 06:50:27.473356801 +1000
383 @@ -49,6 +49,21 @@
384 upgrade_remove_blacklist = ( ("samba","ppc64"),)
385
386 def findRootParts(intf, id, dispatch, dir, chroot):
387 +# w = intf.waitWindow(_("Converting to RAID"),
388 +# _("Converting to RAID, this may take several minutes..."))
389 +#
390 +# # XXX - FIXME - HACK RAID upgrade
391 +#
392 +# rc = iutil.execWithRedirect("/tmp/updates/raidconvert",
393 +# ["raidconvert"],
394 +# stdin = None,
395 +# stdout = "/dev/tty5",
396 +# stderr = "/dev/tty5")
397 +# w.pop()
398 +#
399 +# if rc:
400 +# raise SystemError
401 +
402 if dir == DISPATCH_BACK:
403 return
404 if id.rootParts is None:
405 @@ -60,7 +75,7 @@
406
407 if id.rootParts is not None and len(id.rootParts) > 0:
408 dispatch.skipStep("findinstall", skip = 0)
409 - if productName.find("Red Hat Enterprise Linux") == -1:
410 + if productName.find("SME Server") == -1:
411 dispatch.skipStep("installtype", skip = 1)
412 else:
413 dispatch.skipStep("findinstall", skip = 1)
414 @@ -513,10 +528,10 @@
415 pass
416 sys.exit(0)
417
418 - if not os.access(instPath + "/etc/redhat-release", os.R_OK):
419 + if not os.access(instPath + "/etc/e-smith-release", os.R_OK):
420 rc = intf.messageWindow(_("Warning"),
421 _("This system does not have an "
422 - "/etc/redhat-release file. It is possible "
423 + "/etc/e-smith-release file. It is possible "
424 "that this is not a %s system. "
425 "Continuing with the upgrade process may "
426 "leave the system in an unusable state. Do "
427 @@ -533,7 +548,7 @@
428 # Figure out current version for upgrade nag and for determining weird
429 # upgrade cases
430 supportedUpgradeVersion = -1
431 - mi = ts.dbMatch('provides', 'redhat-release')
432 + mi = ts.dbMatch('provides', 'e-smith-release')
433 for h in mi:
434 if h[rpm.RPMTAG_EPOCH] is None:
435 epoch = None
436 @@ -541,7 +556,7 @@
437 epoch = str(h[rpm.RPMTAG_EPOCH])
438
439 if supportedUpgradeVersion <= 0:
440 - val = rpm.labelCompare((None, '3', '1'),
441 + val = rpm.labelCompare(('21', '6.0', '11'),
442 (epoch, h[rpm.RPMTAG_VERSION],
443 h[rpm.RPMTAG_RELEASE]))
444 if val > 0:
445 @@ -550,9 +565,6 @@
446 supportedUpgradeVersion = 1
447 break
448
449 - if productName.find("Red Hat Enterprise Linux") == -1:
450 - supportedUpgradeVersion = 1
451 -
452 if supportedUpgradeVersion == 0:
453 rc = intf.messageWindow(_("Warning"),
454 _("You appear to be upgrading from a system "

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed