0.7.12 (patches unapplied)import/0.7.12

Imported using git-ubuntu import.

2 files changed, 12 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 01fe2a0..73c18a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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 <michael.vogt@ubuntu.com> 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()
diff --git a/ubuntucoreupgrader/apply.py b/ubuntucoreupgrader/apply.py
index 9fb325d..a1e55af 100644
--- a/ubuntucoreupgrader/apply.py
+++ b/ubuntucoreupgrader/apply.py
@@ -39,11 +39,9 @@ class ApplyUpgrade:
 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