[rhel7-branch 1/6] Remove redundant check for parents in Blivet.newBTRFS.

dwlehman installerbot-noreply at redhat.com
Mon Jun 1 14:54:56 UTC 2015


In reply to line 440 of blivet/devices/btrfs.py:

Good catch. What I need to do is remove the second `%s` so the code matches the master commit, like this:

```patch
diff --git a/blivet/devices/btrfs.py b/blivet/devices/btrfs.py
index 9290a13..9866d80 100644
--- a/blivet/devices/btrfs.py
+++ b/blivet/devices/btrfs.py
@@ -434,10 +434,10 @@ class BTRFSSubVolumeDevice(BTRFSDevice):
         super(BTRFSSubVolumeDevice, self).__init__(*args, **kwargs)
 
         if len(self.parents) != 1:
-            raise errors.BTRFSValueError("%s %s must have exactly one parent." % self.type)
+            raise errors.BTRFSValueError("%s must have exactly one parent." % self.type)
 
         if not isinstance(self.parents[0], BTRFSDevice):
-            raise errors.BTRFSValueError("%s %s's unique parent must be a BTRFSDevice." % self.type)
+            raise errors.BTRFSValueError("%s unique parent must be a BTRFSDevice." % self.type)
 
         self.volume._addSubVolume(self)
 
```

-- 
To view this comment on github, visit https://github.com/dwlehman/blivet/commit/ad176cb177fdd587e747fb72339f95a168890c00#commitcomment-11455890


More information about the anaconda-patches mailing list