diff -Nru ubuntu-core-upgrader-0.7.10+ppa2/debian/changelog ubuntu-core-upgrader-0.7.13~ppa1/debian/changelog --- ubuntu-core-upgrader-0.7.10+ppa2/debian/changelog 2015-06-04 21:12:53.000000000 +0000 +++ ubuntu-core-upgrader-0.7.13~ppa1/debian/changelog 2015-09-15 07:06:11.000000000 +0000 @@ -1,4 +1,25 @@ -ubuntu-core-upgrader (0.7.10+ppa2) vivid; urgency=medium +ubuntu-core-upgrader (0.7.13~ppa1) vivid; urgency=medium + + * backport to vivid + + -- Michael Vogt Tue, 15 Sep 2015 09:06:08 +0200 + +ubuntu-core-upgrader (0.7.13) wily; urgency=low + + * fix pyflakes error + + -- Michael Vogt Wed, 17 Jun 2015 16:56:32 +0200 + +ubuntu-core-upgrader (0.7.12) wily; urgency=low + + * ubuntucoreupgrader/apply.py: + - always send json progress on stdout to have progress for + snapyp with s-i 3.0 that does not store the progress information + in its global config + + -- Michael Vogt Wed, 17 Jun 2015 15:44:49 +0200 + +ubuntu-core-upgrader (0.7.11) wily; urgency=medium * ubuntucoreupgrader/upgrader.py: Call os.sync() at end of sync_partitions() and after each unpack to minimise unflushed data and thus minimise the diff -Nru ubuntu-core-upgrader-0.7.10+ppa2/ubuntucoreupgrader/apply.py ubuntu-core-upgrader-0.7.13~ppa1/ubuntucoreupgrader/apply.py --- ubuntu-core-upgrader-0.7.10+ppa2/ubuntucoreupgrader/apply.py 2015-03-13 08:04:13.000000000 +0000 +++ ubuntu-core-upgrader-0.7.13~ppa1/ubuntucoreupgrader/apply.py 2015-06-17 14:57:51.000000000 +0000 @@ -5,6 +5,7 @@ import sys from systemimage.config import config +config # pyflakes class ApplyUpgradeError(Exception): @@ -39,11 +40,9 @@ stdout = "" while p.poll() is None: # send alive ping - if getattr(config, "machine_readable", False): - # ensure its written out - sys.stdout.write(json.dumps({"type": "spinner", - "msg": "Applying update"})+"\n") - sys.stdout.flush() + sys.stdout.write(json.dumps({"type": "spinner", + "msg": "Applying update"})+"\n") + sys.stdout.flush() if select.select([p.stdout.fileno()], [], [], 0.1) != ([], [], []): stdout += p.stdout.read(1).decode("utf-8", errors="replace") # get return code