[PATCH] Remove another function from isys

David Shea dshea at redhat.com
Thu Jun 18 19:01:35 UTC 2015


Python 3 adds os.sync, so we can use that now.
---
 pyanaconda/bootloader.py    | 11 +++++------
 pyanaconda/isys/__init__.py |  5 -----
 pyanaconda/isys/isys.c      | 10 ----------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 1f1efac..9b4f6eb 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -32,7 +32,6 @@ from itertools import chain
 
 from pyanaconda import iutil
 from blivet.devicelibs import raid
-from pyanaconda.isys import sync
 from pyanaconda.product import productName
 from pyanaconda.flags import flags, can_touch_runtime_system
 from blivet.errors import StorageError
@@ -989,7 +988,7 @@ class BootLoader(object):
             return
 
         self.write_config()
-        sync()
+        os.sync()
         self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
         self.install()
 
@@ -1635,13 +1634,13 @@ class GRUB2(GRUB):
         try:
             self.write_device_map()
             self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
-            sync()
+            os.sync()
             self.install()
-            sync()
+            os.sync()
             self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
         finally:
             self.write_config()
-            sync()
+            os.sync()
             self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
 
     def check(self):
@@ -1794,7 +1793,7 @@ class EFIGRUB(GRUB2):
             return
 
         try:
-            sync()
+            os.sync()
             self.stage2_device.format.sync(root=iutil.getTargetPhysicalRoot())
             self.install()
         finally:
diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py
index 0afa61a..a9f4168 100644
--- a/pyanaconda/isys/__init__.py
+++ b/pyanaconda/isys/__init__.py
@@ -48,11 +48,6 @@ MIN_GUI_RAM = MIN_RAM + GUI_INSTALL_EXTRA_RAM
 SQUASHFS_EXTRA_RAM = 750
 NO_SWAP_EXTRA_RAM = 200
 
-## Flush filesystem buffers.
-def sync():
-    # TODO: This can be replaced with os.sync in Python 3.3
-    return _isys.sync()
-
 ISO_BLOCK_SIZE = 2048
 
 ## Determine if a file is an ISO image or not.
diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c
index 1f1780f..23b5e7e 100644
--- a/pyanaconda/isys/isys.c
+++ b/pyanaconda/isys/isys.c
@@ -21,19 +21,16 @@
 #include <Python.h>
 #include <stdio.h>
 #include <sys/time.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <execinfo.h>
 #include <stdlib.h>
 #include <string.h>
 
-static PyObject * doSync(PyObject * s, PyObject * args);
 static PyObject * doSignalHandlers(PyObject *s, PyObject *args);
 static PyObject * doSetSystemTime(PyObject *s, PyObject *args);
 
 static PyMethodDef isysModuleMethods[] = {
-    { "sync", doSync, METH_NOARGS, "Synchronize storage"},
     { "installSyncSignalHandlers", doSignalHandlers, METH_NOARGS, "Install synchronous signal handlers"},
     { "set_system_time", doSetSystemTime, METH_VARARGS, "set system time"},
     { NULL, NULL, 0, NULL }
@@ -53,13 +50,6 @@ PyInit__isys(void) {
     return PyModule_Create(&moduledef);
 }
 
-static PyObject * doSync(PyObject * s, PyObject * args) {
-    sync();
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
 static void sync_signal_handler(int signum) {
     void *array[20];
     size_t size;
-- 
2.4.3



More information about the anaconda-patches mailing list