diff options
author | Andrew Gaffney <agaffney@gentoo.org> | 2006-09-03 19:59:17 +0000 |
---|---|---|
committer | Andrew Gaffney <agaffney@gentoo.org> | 2006-09-03 19:59:17 +0000 |
commit | ab28a9a1c96fd15084844f5662a80db43daa897d (patch) | |
tree | 7d557992aa99f7a2240812c88d9e624f4ec8fee8 | |
parent | Lots of internationalization fixes. Point to a translation path called (diff) | |
download | gli-ab28a9a1c96fd15084844f5662a80db43daa897d.tar.gz gli-ab28a9a1c96fd15084844f5662a80db43daa897d.tar.bz2 gli-ab28a9a1c96fd15084844f5662a80db43daa897d.zip |
src/GLIArchitectureTemplate.py:
force conversion of 'mb' to long
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1510 f8877401-5920-0410-a79b-8e2d7e04ca0d
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/GLIArchitectureTemplate.py | 15 |
2 files changed, 12 insertions, 9 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Gentoo Linux Installer # Copyright 2005-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.676 2006/09/02 23:54:46 codeman Exp $ +# $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.677 2006/09/03 19:59:17 agaffney Exp $ + + 3 Sep 2006; Andrew Gaffney <agaffney@gentoo.org> + src/GLIArchitectureTemplate.py: + force conversion of 'mb' to long 2 Sep 2006; Preston Cody <codeman@gentoo.org> Lots of internationalization fixes. Point to a translation path called diff --git a/src/GLIArchitectureTemplate.py b/src/GLIArchitectureTemplate.py index d93a756..f54fbb4 100644 --- a/src/GLIArchitectureTemplate.py +++ b/src/GLIArchitectureTemplate.py @@ -5,7 +5,7 @@ # of which can be found in the main directory of this project. Gentoo Linux Installer -$Id: GLIArchitectureTemplate.py,v 1.287 2006/09/01 23:08:55 agaffney Exp $ +$Id: GLIArchitectureTemplate.py,v 1.288 2006/09/03 19:59:17 agaffney Exp $ The ArchitectureTemplate is largely meant to be an abstract class and an interface (yes, it is both at the same time!). The purpose of this is to create @@ -1401,11 +1401,11 @@ class ArchitectureTemplate: def _check_table_changed(self, oldparts, newparts): for part in newparts: - if not newparts[part]['origminor'] or not oldparts.get_partition(part): - return True oldpart = oldparts[part] newpart = newparts[part] - if oldpart['type'] == newpart['type'] and oldpart['mb'] == newpart['mb'] and not newpart['resized'] and not newpart['format']: + if not newparts[part]['origminor'] or not oldparts.get_partition(part): + return True + if oldpart['type'] == newpart['type'] and long(oldpart['mb']) == long(newpart['mb']) and not newpart['resized'] and not newpart['format']: continue else: return True @@ -1414,11 +1414,11 @@ class ArchitectureTemplate: def _check_table_layout_changed(self, oldparts, newparts): # This function is similar to the above function except it will see it as un-changed even if a partition is just being reformatted for part in newparts: - if not newparts[part]['origminor'] or not oldparts.get_partition(part): - return True oldpart = oldparts[part] newpart = newparts[part] - if oldpart['type'] == newpart['type'] and oldpart['mb'] == newpart['mb'] and not newpart['resized']: + if not newparts[part]['origminor'] or not oldparts.get_partition(part): + return True + if oldpart['type'] == newpart['type'] and long(oldpart['mb']) == long(newpart['mb']) and not newpart['resized']: continue else: return True @@ -1683,7 +1683,6 @@ class ArchitectureTemplate: def partition(self): """ TODO: - before step 3, wipe drive and use the default disklabel for arch skip fixed partitions in all passes (in GLISD maybe?) """ parts_old = {} |