Merge lp:~javier.collado/utah/bug1060871 into lp:utah

[Javier Collado]

The question variable was assigned inside and `if` but used in the `else` clause as
well. This fix moves the assignment to the line before the `if/else`.

(It's strange that static analysis tools don't catch this kind of bugs)

[Max Brustkern (nuclearbob)]

This resolves the issue I was having. I'll merge it and get back to hunting down that download problem. I'm going to try changing the commands we use to install things in the preseed.

review: Approve

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-09-06 11:41:21 +0000
+++ utah/provisioning/provisioning.py	2012-10-03 10:55:45 +0000
@@ -775,11 +775,11 @@
             tmpdir = self.tmpdir
         preseed = Preseed(self.preseed)
         if 'preseed/late_command' in preseed:
+            question = preseed['preseed/late_command']
             if self.installtype == 'desktop':
                 self.logger.info('Changing d-i latecommand '
                         + 'to ubiquity success_command '
                         + 'and prepending ubiquity lines')
-                question = preseed['preseed/late_command']
                 question.owner = 'ubiquity'
                 question.qname = 'ubiquity/success_command'
                 question.value.prepend(