Merge lp:~sergiusens/phablet-tools/uibu_script_fixes into lp:phablet-tools

[Sergio Schvezov]

phablet-flash: Using the correct script for an Image Based Upgrade.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-tools-ci/134/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

works for me

review: Approve

=== modified file 'phabletutils/projects.py'
--- phabletutils/projects.py	2013-08-09 01:41:05 +0000
+++ phabletutils/projects.py	2013-08-09 17:33:14 +0000
@@ -25,7 +25,6 @@
 from phabletutils.downloads import checksum_verify
 from phabletutils.resources import (File, SignedFile)
 from phabletutils import downloads
-from phabletutils import settings
 from time import sleep
 from textwrap import dedent
 
@@ -231,7 +230,7 @@
     def create_ubuntu_command_file(self):
         ubuntu_command_file = tempfile.NamedTemporaryFile(delete=False)
         with ubuntu_command_file as output_file:
-            output_file.write(settings.ubuntu_recovery_script)
+            output_file.write(self.ubuntu_recovery_script)
             output_file.write(self._command_part)
             output_file.write('unmount system\n')
         return ubuntu_command_file.name