[master 1/3] Change all instances of GLib.Error to GLib.GError.

mulkieran installerbot-noreply at redhat.com
Sat Mar 7 18:03:53 UTC 2015


From: mulhern <amulhern at redhat.com>

This is the precise error the invoked functions are returning and GError
is a more precise match than Error in false positives.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devices/btrfs.py | 4 ++--
 blivet/devicetree.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index 674d3c4..85e18a3 100644
--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
@@ -356,7 +356,7 @@ def _getDefaultSubVolumeID(self):
         subvolid = None
         try:
             subvolid = blockdev.btrfs_get_default_subvolume_id(self.originalFormat._mountpoint)
-        except GLib.Error as e:
+        except GLib.GError as e:
             log.debug("failed to get default subvolume id: %s", e)
 
         self._defaultSubVolumeID = subvolid
@@ -368,7 +368,7 @@ def _setDefaultSubVolumeID(self, vol_id):
         """
         try:
             blockdev.btrfs_set_default_subvolume(self.originalFormat._mountpoint, vol_id)
-        except GLib.Error as e:
+        except GLib.GError as e:
             log.error("failed to set new default subvolume id (%s): %s",
                       vol_id, e)
             # The only time we set a new default subvolume is so we can remove
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index c61070d..1d5823d 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -1154,7 +1154,7 @@ def addUdevDevice(self, info):
                 if devname:
                     try:
                         blockdev.md_run(devname)
-                    except GLib.Error as e:
+                    except GLib.GError as e:
                         log.warning("Failed to start possibly degraded md array: %s", e)
                     else:
                         udev.settle()


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/f530c555320348c5a8ccf5b71a3f9a1c082054cc


More information about the anaconda-patches mailing list