Merge lp:~altair-ibn-la-ahad/ubuntu/trusty/ubuntu-release-upgrader/fix-for-1313012 into lp:ubuntu/trusty/ubuntu-release-upgrader

[Andreas Altaïr Redmer]

fixes LP: #1313012

[Dmitry Shachnev (mitya57)]

Thanks for your work.

- Please submit fixes against lp:ubuntu-release-upgrader, not against UDD branch. I am rejecting this one.
- (LP:# 1313012) is wrong syntax :-)
- exit `somecommand | wc -l` is a very weird way to check if command output is empty. I recommend you to use subprocess.PIPE instead and check the output yourself.
- I would even drop shell=True at all and manually search for "do-release-upgrade" in the output. No need for grep -v grep will be needed.

review: Needs Resubmitting

[Sebastien Bacher (seb128)]

setting as "work in progress" to get it out of the sponsoring queue, please set it back to "needs review" once the review comment issues are resolved

Unmerged revisions

55. By Andreas Altaïr Redmer on 2014-05-03

* check-new-release-gtk:
  - quit if do-release-upgrade is running (LP: #1313012)

=== modified file 'check-new-release-gtk'
--- check-new-release-gtk	2013-10-04 19:17:49 +0000
+++ check-new-release-gtk	2014-05-03 03:48:33 +0000
@@ -92,8 +92,15 @@
     window.show_all()
     Gtk.main()
 
+  # quit if /usr/bin/do-release-upgrade is currently running (LP:# 1313012)
+  def quit_if_dist_upgrade_running(self):
+    number_of_running_upgrades = subprocess.call("exit `ps aux|grep /usr/bin/do-release-upgrade|grep -v grep|wc -l`", shell=True)
+    if (number_of_running_upgrades > 0) :
+        sys.exit()
+	
   def new_dist_available(self, meta_release, new_dist):
     logging.debug("new_dist_available: %s" % new_dist)
+    self.quit_if_dist_upgrade_running()
     self.new_dist = new_dist
     client =  Gio.Settings("com.ubuntu.update-manager")
     ignore_dist = client.get_string("check-new-release-ignore")

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-11 15:25:07 +0000
+++ debian/changelog	2014-05-03 03:48:33 +0000
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:0.220.2ubuntu1) UNRELEASED; urgency=medium
+
+  * check-new-release-gtk:
+    - quit if do-release-upgrade is running (LP: #1313012)
+
+ -- Andreas Altair Redmer <[e-mail]>  Sat, 03 May 2014 11:37:24 +0800
+
 ubuntu-release-upgrader (1:0.220.2) trusty; urgency=medium
 
   * DistUpgrade/DistUpgradeController.py: