Merge lp:~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/use-os-sync into lp:ubuntu/vivid/ubuntu-core-upgrader

[James Hunt]

Use os.sync() rather than sync(1).

[Daniel Holbach (dholbach)]

LP:1435774 → LP: #1435774

[Michael Vogt (mvo)]

Nice catch Daniel, indeed.

review: Needs Fixing

[lp:~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/use-os-sync]

33. By James Hunt on 2015-04-23

* Fixup bug ref in changelog.

[James Hunt (jamesodhunt)]

Updated.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-21 12:56:09 +0000
+++ debian/changelog	2015-04-23 09:01:34 +0000
@@ -1,10 +1,10 @@
 ubuntu-core-upgrader (0.7.11) vivid; urgency=medium
 
-  * ubuntucoreupgrader/upgrader.py: Call sync at end of sync_partitions() and
-    after each unpack to minimise unflushed data and thus minimise the risk of
-    corruption issues (such as LP:1435774).
+  * ubuntucoreupgrader/upgrader.py: Call os.sync() at end of sync_partitions()
+    and after each unpack to minimise unflushed data and thus minimise the
+    risk of corruption issues (such as LP: #1435774).
 
- -- James Hunt <[e-mail]>  Thu, 16 Apr 2015 20:45:12 +0100
+ -- James Hunt <[e-mail]>  Wed, 22 Apr 2015 10:36:19 +0100
 
 ubuntu-core-upgrader (0.7.10) vivid; urgency=medium
 

=== modified file 'ubuntucoreupgrader/upgrader.py'
--- ubuntucoreupgrader/upgrader.py	2015-04-16 19:46:24 +0000
+++ ubuntucoreupgrader/upgrader.py	2015-04-23 09:01:34 +0000
@@ -896,9 +896,7 @@
                                    self.options.root_dir))
         tar.close()
 
-        if subprocess.call(['/bin/sync']) != 0:
-            log.error('failed to flush data after unpack')
-            sys.exit(1)
+        os.sync()
 
     def sync_partitions(self):
         '''
@@ -992,9 +990,7 @@
             log.error('failed to sync partitions')
             sys.exit(1)
 
-        if subprocess.call(['/bin/sync']) != 0:
-            log.error('failed to flush data for partition sync')
-            sys.exit(1)
+        os.sync()
 
         os.chdir(cwd)