Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 176781 Details for
Bug 217132
Upgrade from fc5 i386 to fc6 x86_64
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Show architecture upgrade confirmation dialog
upgrade-i386-to-x86_64.patch (text/plain), 4.20 KB, created by
Martin Sivák
on 2007-08-28 15:05:38 UTC
(
hide
)
Description:
Show architecture upgrade confirmation dialog
Filename:
MIME Type:
Creator:
Martin Sivák
Created:
2007-08-28 15:05:38 UTC
Size:
4.20 KB
patch
obsolete
>diff --git a/backend.py b/backend.py >index cc10a25..eb4b08f 100644 >--- a/backend.py >+++ b/backend.py >@@ -222,6 +222,7 @@ def doRepoSetup(anaconda): > return DISPATCH_BACK > if anaconda.id.upgrade: > anaconda.backend.checkSupportedUpgrade(anaconda) >+ iutil.writeRpmPlatform(anaconda.rootPath) > > def doPostSelection(anaconda): > return anaconda.backend.doPostSelection(anaconda) >diff --git a/dispatch.py b/dispatch.py >index 07f1adb..4d3f059 100644 >--- a/dispatch.py >+++ b/dispatch.py >@@ -32,7 +32,7 @@ from partitioning import partitionObjectsInitialize > from partitioning import partitioningComplete > from bootloader import writeBootloader, bootloaderSetupChoices > from flags import flags >-from upgrade import upgradeMountFilesystems >+from upgrade import upgradeMountFilesystems, queryUpgradeArch > from upgrade import upgradeSwapSuggestion, upgradeMigrateFind > from upgrade import findRootParts, queryUpgradeContinue > from network import networkDeviceCheck >@@ -73,6 +73,7 @@ installSteps = [ > ("autopartitionexecute", doAutoPartition, ), > ("partition", ), > ("upgrademount", upgradeMountFilesystems, ), >+ ("upgradearchitecture", queryUpgradeArch, ), > ("upgradecontinue", queryUpgradeContinue, ), > ("upgradeswapsuggestion", upgradeSwapSuggestion, ), > ("addswap", ), >diff --git a/flags.py b/flags.py >index af69aeb..e460ca4 100644 >--- a/flags.py >+++ b/flags.py >@@ -63,6 +63,7 @@ class Flags: > self.__dict__['flags']['selinux'] = SELINUX_DEFAULT > self.__dict__['flags']['debug'] = 0 > self.__dict__['flags']['targetarch'] = None >+ self.__dict__['flags']['updateRpmPlatform'] = False > self.__dict__['flags']['cmdline'] = self.createCmdlineDict() > self.__dict__['flags']['useIPv4'] = True > self.__dict__['flags']['useIPv6'] = True >diff --git a/iutil.py b/iutil.py >index 70d12bf..5e371f0 100644 >--- a/iutil.py >+++ b/iutil.py >@@ -428,7 +428,7 @@ def writeRpmPlatform(root="/"): > > if flags.test: > return >- if os.access("%s/etc/rpm/platform" %(root,), os.R_OK): >+ if not flags.updateRpmPlatform and os.access("%s/etc/rpm/platform" %(root,), os.R_OK): > return > if not os.access("%s/etc/rpm" %(root,), os.X_OK): > os.mkdir("%s/etc/rpm" %(root,)) >diff --git a/upgrade.py b/upgrade.py >index 6458301..65014a5 100644 >--- a/upgrade.py >+++ b/upgrade.py >@@ -45,6 +45,39 @@ if rhpl.getArch() == "x86_64": > if rhpl.getArch() == "ppc": > upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64"), ("mkinitrd", "ppc64")] ) > >+def isUpgradingArch(anaconda): >+ """anaconda -> (bool, oldarch) >+ Check if the upgrade should change architecture of instalation""" >+ >+ rpmplatform = open(anaconda.rootPath+"/etc/rpm/platform").readline().strip() >+ rpmarch = rpmplatform[:rpmplatform.index("-")] >+ >+ return rhpl.arch.canonArch!=rpmarch, rpmarch >+ >+ >+def queryUpgradeArch(anaconda): >+ archupgrade, oldrpmarch = isUpgradingArch(anaconda) #Check if we are to upgrade the architecture of previous product >+ >+ if anaconda.dir == DISPATCH_FORWARD or not archupgrade: >+ return DISPATCH_FORWARD >+ >+ rc = anaconda.intf.messageWindow(_("Proceed with upgrade?"), >+ _("You have choosen the upgrade for %s " >+ "architecture, but the installed system " >+ "is for %s architecture. " >+ "\n\n" % (rhpl.arch.canonArch, oldrpmarch,)) + >+ _("Would you like to upgrade " >+ " the installed system to the %s architecture?" % (rhpl.arch.canonArch,)), >+ type="custom", custom_icon=["error","error"], >+ custom_buttons=[_("_Exit installer"), _("_Continue")]) >+ >+ if rc == 0: >+ sys.exit(0) >+ >+ flags.updateRpmPlatform = True >+ >+ return DISPATCH_FORWARD >+ > def queryUpgradeContinue(anaconda): > if anaconda.dir == DISPATCH_FORWARD: > return >@@ -373,6 +406,7 @@ def setSteps(anaconda): > "upgrademount", > "upgrademigfind", > "upgrademigratefs", >+ "upgradearchitecture", > "upgradecontinue", > "reposetup", > "upgbootloader",
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 217132
: 176781