summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2010-02-15 14:40:14 -0500
committerChris Lumens <clumens@redhat.com>2010-02-15 14:42:59 -0500
commit6af68d22f7cc78f59ffc4220f5037317f86f1486 (patch)
tree1618ccb1cd53ebecc12e58151d199ac78b051da4
parent699be4202d5880a621556603eefe17992eaf52c3 (diff)
downloadanaconda-6af68d22f7cc78f59ffc4220f5037317f86f1486.tar.gz
anaconda-6af68d22f7cc78f59ffc4220f5037317f86f1486.tar.xz
anaconda-6af68d22f7cc78f59ffc4220f5037317f86f1486.zip
Don't always set anaconda.upgrade to be True (#565622).
Since Upgrade.execute gets called on installs too (both the upgrade and install kickstart commands have the same handler) we need to make sure to set it to the right value. Otherwise, all kickstart installs end up being upgrades.
-rw-r--r--kickstart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kickstart.py b/kickstart.py
index 717cd09f6..43e62cfdc 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -933,7 +933,7 @@ class Timezone(commands.timezone.FC6_Timezone):
class Upgrade(commands.upgrade.F11_Upgrade):
def execute(self, anaconda):
- anaconda.upgrade = True
+ anaconda.upgrade = self.upgrade
class VolGroupData(commands.volgroup.FC3_VolGroupData):
def execute(self, anaconda):