172 |
- else: |
- else: |
173 |
- devname = drive |
- devname = drive |
174 |
- partList.append("%s (%s)" %(desc, drive)) |
- partList.append("%s (%s)" %(desc, drive)) |
175 |
+ partList.append("Upgrade existing \"%s\" system" %(desc)) |
+ partList.append(_("Upgrade existing \"%s\" system") %(desc)) |
176 |
|
|
177 |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
(button, choice) = ListboxChoiceWindow(screen, _("System to Upgrade"), |
178 |
- _("One or more existing Linux installations " |
- _("One or more existing Linux installations " |
217 |
|
|
218 |
dosync() |
dosync() |
219 |
|
|
|
--- anaconda-11.1.2.87/fedorakmod.py.sme2 2007-08-07 14:45:51.000000000 -0600 |
|
|
+++ anaconda-11.1.2.87/fedorakmod.py 2008-03-16 12:21:33.000000000 -0600 |
|
|
@@ -27,6 +27,9 @@ |
|
|
from yum.constants import TS_INSTALL |
|
|
from yum.plugins import TYPE_CORE, PluginYumExit |
|
|
|
|
|
+import logging |
|
|
+log = logging.getLogger("anaconda") |
|
|
+ |
|
|
requires_api_version = '2.4' |
|
|
plugin_type = (TYPE_CORE,) |
|
|
|
|
|
@@ -118,10 +121,10 @@ |
|
|
kernel = ImmutableSet(getKernelReqs(po)) |
|
|
kernelReqs = kernel.intersection(kernelProvides) |
|
|
if len(kernel) == 0: |
|
|
- print "Bad kmod package '%s' does not require a kernel" % po |
|
|
+ log.warning("Bad kmod package '%s' does not require a kernel" % po) |
|
|
continue |
|
|
elif len(kernelReqs) > 1: |
|
|
- print "Bad kmod package: Must require only one kernel" |
|
|
+ log.warning("Bad kmod package: Must require only one kernel") |
|
|
continue |
|
|
|
|
|
# Figure out the real name of this kmod |
|
|
@@ -133,7 +136,7 @@ |
|
|
# Yum bug |
|
|
name = fakeName(po) |
|
|
elif len(name) != 1: |
|
|
- print "Non compliant kmod package: %s" % po |
|
|
+ log.warning("Non compliant kmod package: %s" % po) |
|
|
continue |
|
|
po.kmodName = name[0] |
|
|
|
|
220 |
--- anaconda-11.1.2.87/findpackageset.py.smeserver 2005-02-08 07:37:30.000000000 -0700 |
--- anaconda-11.1.2.87/findpackageset.py.smeserver 2005-02-08 07:37:30.000000000 -0700 |
221 |
+++ anaconda-11.1.2.87/findpackageset.py 2007-12-20 13:05:57.000000000 -0700 |
+++ anaconda-11.1.2.87/findpackageset.py 2007-12-20 13:05:57.000000000 -0700 |
222 |
@@ -108,21 +108,15 @@ |
@@ -108,21 +108,15 @@ |
456 |
else: |
else: |
457 |
anaconda.dispatch.gotoNext() |
anaconda.dispatch.gotoNext() |
458 |
|
|
459 |
--- anaconda-11.1.2.87/lang-table.smeserver 2006-12-04 13:31:57.000000000 -0700 |
--- anaconda-11.1.2.87/yuminstall.py.sme 2007-09-11 11:51:21.000000000 -0600 |
460 |
+++ anaconda-11.1.2.87/lang-table 2007-12-20 14:07:37.000000000 -0700 |
+++ anaconda-11.1.2.87/yuminstall.py 2008-03-17 08:01:27.000000000 -0600 |
461 |
@@ -1,54 +1,8 @@ |
@@ -1083,7 +1083,8 @@ |
462 |
-Afrikaans af latarcyrheb-sun16 af_ZA.UTF-8 us Africa/Johannesburg |
|
463 |
-Arabic ar latarcyrheb-sun16 ar_SA.UTF-8 us Asia/Riyadh |
if foundModule == 1: |
464 |
-Assamese as none as_IN.UTF-8 us Asia/Calcutta |
for (n, arch, tag) in kernelVersions: |
465 |
-Bengali bn none bn_BD.UTF-8 us Asia/Dhaka |
- recreateInitrd(n, anaconda.rootPath) |
466 |
-Bengali(India) bn none bn_IN.UTF-8 us Asia/Calcutta |
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
467 |
-Bulgarian bg latarcyrheb-sun16 bg_BG.UTF-8 bg Europe/Sofia |
+ recreateInitrd(n, anaconda.rootPath) |
468 |
Catalan ca latarcyrheb-sun16 ca_ES.UTF-8 es Europe/Madrid |
|
469 |
-Chinese(Simplified) zh_CN none zh_CN.UTF-8 us Asia/Shanghai |
def selectBestKernel(self, anaconda): |
470 |
-Chinese(Traditional) zh_TW none zh_TW.UTF-8 us Asia/Taipei |
"""Find the best kernel package which is available and select it.""" |
471 |
-Croatian hr latarcyrheb-sun16 hr_HR.UTF-8 croat Europe/Zagreb |
@@ -1729,7 +1730,8 @@ |
472 |
-Czech cs latarcyrheb-sun16 cs_CZ.UTF-8 cz-lat2 Europe/Prague |
# to the old method. |
473 |
-Danish da latarcyrheb-sun16 da_DK.UTF-8 dk Europe/Copenhagen |
if len(self._installedDriverModules) == len(anaconda.id.extraModules): |
474 |
Dutch nl latarcyrheb-sun16 nl_NL.UTF-8 nl Europe/Amsterdam |
for (n, arch, tag) in self.kernelVersionList(): |
475 |
English en latarcyrheb-sun16 en_US.UTF-8 us America/New_York |
- recreateInitrd(n, anaconda.rootPath) |
476 |
-Estonian et latarcyrheb-sun16 et_EE.UTF-8 et Europe/Tallinn |
+ if os.access("/boot/System.map-%s" %(n,), os.X_OK): |
477 |
-Finnish fi latarcyrheb-sun16 fi_FI.UTF-8 fi Europe/Helsinki |
+ recreateInitrd(n, anaconda.rootPath) |
478 |
French fr latarcyrheb-sun16 fr_FR.UTF-8 fr-latin1 Europe/Paris |
else: |
479 |
German de latarcyrheb-sun16 de_DE.UTF-8 de-latin1-nodeadkeys Europe/Berlin |
modulesList = filter(lambda m: m not in self._installedDriverModules, anaconda.id.extraModules) |
480 |
-Greek el iso07u-16 el_GR.UTF-8 gr Europe/Athens |
self.copyExtraModules(anaconda, modulesList) |
|
-Gujarati gu none gu_IN.UTF-8 us Asia/Calcutta |
|
|
-Hindi hi none hi_IN.UTF-8 us Asia/Calcutta |
|
|
-Hungarian hu latarcyrheb-sun16 hu_HU.UTF-8 hu Europe/Budapest |
|
|
-Icelandic is latarcyrheb-sun16 is_IS.UTF-8 is-latin1 Atlantic/Reykjavik |
|
|
-Indonesian id latarcryheb-sun16 id_ID.UTF-8 us Asia/Jakarta |
|
|
Italian it latarcyrheb-sun16 it_IT.UTF-8 it Europe/Rome |
|
|
-Japanese ja none ja_JP.UTF-8 jp106 Asia/Tokyo |
|
|
-Kannada kn none kn_IN.UTF-8 us Asia/Calcutta |
|
|
-Korean ko none ko_KR.UTF-8 us Asia/Seoul |
|
|
-Macedonian mk latarcyrheb-sun16 mk_MK.UTF-8 mk Europe/Skopje |
|
|
-Malay ms latarcyrheb-sun16 ms_MY.UTF-8 us Asia/Kuala_Lumpur |
|
|
-Malayalam ml none ml_IN.UTF-8 us Asia/Calcutta |
|
|
-Marathi mr none mr_IN.UTF-8 us Asia/Calcutta |
|
|
-Norwegian nb latarcyrheb-sun16 nb_NO.UTF-8 no Europe/Oslo |
|
|
-Northern Sotho nso latarcyrheb-sun16 nso_ZA.UTF-8 us Africa/Johannesburg |
|
|
-Oriya or none or_IN.UTF-8 us Asia/Calcutta |
|
|
-Polish pl latarcyrheb-sun16 pl_PL.UTF-8 pl2 Europe/Warsaw |
|
|
-Portuguese pt latarcyrheb-sun16 pt_PT.UTF-8 pt-latin1 Europe/Lisbon |
|
|
-Portuguese(Brazilian) pt_BR latarcyrheb-sun16 pt_BR.UTF-8 br-abnt2 America/Sao_Paulo |
|
|
-Punjabi pa none pa_IN.UTF-8 us Asia/Calcutta |
|
|
-Russian ru latarcyrheb-sun16 ru_RU.UTF-8 ru Europe/Moscow |
|
|
-Serbian sr latarcyrheb-sun16 sr_CS.UTF-8 sr-cy Europe/Belgrade |
|
|
-Serbian(Latin) sr@Latn latarcyrheb-sun16 sr_CS.UTF-8@Latn sr-cy Europe/Belgrade |
|
|
-Sinhala si none si_LK.UTF-8 us Asia/Colombo |
|
|
-Slovak sk latarcyrheb-sun16 sk_SK.UTF-8 sk-qwerty Europe/Bratislava |
|
|
-Slovenian sl latarcyrheb-sun16 sl_SI.UTF-8 slovene Europe/Ljubljana |
|
|
Spanish es latarcyrheb-sun16 es_ES.UTF-8 es Europe/Madrid |
|
|
Swedish sv latarcyrheb-sun16 sv_SE.UTF-8 sv-latin1 Europe/Stockholm |
|
|
-Tamil ta none ta_IN.UTF-8 us Asia/Calcutta |
|
|
-Telugu te none te_IN.UTF-8 us Asia/Calcutta |
|
|
-Turkish tr latarcyrheb-sun16 tr_TR.UTF-8 trq Europe/Istanbul |
|
|
-Ukrainian uk latarcyrheb-sun16 uk_UA.UTF-8 ua-utf Europe/Kiev |
|
|
-Vietnamese vi latarcyrheb-sun16 vi_VN.UTF-8 us Asia/Saigon |
|
|
-Welsh cy latarcyrheb-sun16 cy_GB.UTF-8 uk Europe/London |
|
|
-Zulu zu latarcyrheb-sun16 zu_ZA.UTF-8 us Africa/Johannesburg |
|