Merge remote-tracking branch 'origin/3.3-devel' into 3.3-release

.packit.yaml

@@ -0,0 +1,13 @@
+actions:
+  get-current-version:
+    - "python3 ./setup.py --version"
+  create-archive:
+    - "make local"
+    - 'bash -c "ls *.tar*"'
+jobs:
+- job: tests
+  metadata:
+    targets:
+    - fedora-all
+    - fedora-eln
+  trigger: pull_request

Makefile

@@ -135,7 +135,7 @@ archive: po-pull
 	git archive --format=tar --prefix=$(PKGNAME)-$(VERSION)/ $(VERSION_TAG) | tar -xf -
 	cp -r po $(PKGNAME)-$(VERSION)
 	cp ChangeLog $(PKGNAME)-$(VERSION)/
-	( cd $(PKGNAME)-$(VERSION) && $(PYTHON) setup.py -q sdist --dist-dir .. )
+	( cd $(PKGNAME)-$(VERSION) && $(PYTHON) setup.py -q sdist --dist-dir .. --mode release )
 	rm -rf $(PKGNAME)-$(VERSION)
 	@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
 	@make tests-archive
@@ -146,7 +146,7 @@ tests-archive:
 
 local: po-pull
 	@make -B ChangeLog
-	$(PYTHON) setup.py -q sdist --dist-dir .
+	$(PYTHON) setup.py -q sdist --dist-dir . --mode normal
 	@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
 	git ls-files tests/ | tar -T- -czf $(PKGNAME)-$(VERSION)-tests.tar.gz
 	@echo "The test archive is in $(PKGNAME)-$(VERSION)-tests.tar.gz"

blivet/blivet.py

@@ -554,7 +554,7 @@ def new_vg(self, *args, **kwargs):
                             safe_name, name)
                 name = safe_name
         else:
-            name = self.suggest_container_name()
+            name = self.suggest_container_name(container_type=devicefactory.DEVICE_TYPE_LVM)
 
         if name in self.names:
             raise ValueError("name already in use")
@@ -721,7 +721,7 @@ def new_btrfs(self, *args, **kwargs):
             dev_class = BTRFSVolumeDevice
             # set up the volume label, using hostname if necessary
             if not name:
-                name = self.suggest_container_name()
+                name = self.suggest_container_name(container_type=devicefactory.DEVICE_TYPE_BTRFS)
             if "label" not in fmt_args:
                 fmt_args["label"] = name
             fmt_args["subvolspec"] = MAIN_VOLUME_ID
@@ -929,15 +929,15 @@ def safe_device_name(self, name, device_type=None):
     def _get_container_name_template(self, prefix=None):
         return prefix or ""
 
-    def suggest_container_name(self, prefix=""):
+    def suggest_container_name(self, prefix="", container_type=None):
         """ Return a reasonable, unused device name.
 
             :keyword prefix: a prefix for the container name
             :returns: the suggested name
             :rtype: str
         """
         if not prefix:
-            prefix = self.short_product_name
+            prefix = self.safe_device_name(self.short_product_name, container_type)
 
         template = self._get_container_name_template(prefix=prefix)
         names = self.names

blivet/devicelibs/edd.py

@@ -664,6 +664,7 @@ def collect_mbrs(devices, root=None):
     """
     mbr_dict = {}
     for dev in devices:
+        fd = -1
         try:
             path = util.Path("/dev", root=root) + dev.name
             fd = os.open(path.ondisk, os.O_RDONLY)
@@ -679,7 +680,7 @@ def collect_mbrs(devices, root=None):
             testdata_log.debug("device %s data[440:443] raised %s", path, e)
             log.error("edd: could not read mbrsig from disk %s: %s",
                       dev.name, str(e))
-            if fd:
+            if fd > 0:
                 os.close(fd)
             continue
 

blivet/devicetree.py

@@ -32,7 +32,7 @@
 
 from .actionlist import ActionList
 from .callbacks import callbacks
-from .errors import DeviceError, DeviceTreeError, StorageError, DuplicateUUIDError
+from .errors import DeviceError, DeviceTreeError, StorageError, DuplicateUUIDError, InvalidMultideviceSelection
 from .deviceaction import ActionDestroyDevice, ActionDestroyFormat
 from .devices import BTRFSDevice, NoDevice, PartitionDevice
 from .devices import LVMLogicalVolumeDevice, LVMVolumeGroupDevice
@@ -963,7 +963,7 @@ def _hide_ignored_disks(self):
             if is_ignored:
                 if len(disk.children) == 1:
                     if not all(self._is_ignored_disk(d) for d in disk.children[0].parents):
-                        raise DeviceTreeError("Including only a subset of raid/multipath member disks is not allowed.")
+                        raise InvalidMultideviceSelection("Including only a subset of raid/multipath member disks is not allowed.")
 
                     # and also children like fwraid or mpath
                     self.hide(disk.children[0])

blivet/errors.py

@@ -233,6 +233,12 @@ class DuplicateVGError(UnusableConfigurationError):
                     "Hint 2: You can get the VG UUIDs by running "
                     "'pvs -o +vg_uuid'.")
 
+
+class InvalidMultideviceSelection(UnusableConfigurationError):
+    suggestion = N_("All parent devices must be selected when choosing exclusive "
+                    "or ignored disks for a multipath or firmware RAID device.")
+
+
 # DeviceAction
 
 

blivet/iscsi.py

@@ -364,6 +364,9 @@ def startup(self):
         if not has_iscsi():
             return
 
+        # make sure that the file /etc/iscsi/initiatorname.iscsi exists
+        util.run_program(["systemctl", "start", "iscsi-init.service"])
+
         if self._initiator == "":
             log.info("no initiator set")
             return

blivet/populator/populator.py

@@ -64,6 +64,9 @@ def parted_exn_handler(exn_type, exn_options, exn_msg):
     if exn_type == parted.EXCEPTION_TYPE_ERROR and \
        exn_options == parted.EXCEPTION_OPT_YES_NO:
         ret = parted.EXCEPTION_RESOLVE_YES
+    elif exn_type == parted.EXCEPTION_TYPE_WARNING and \
+            exn_options & parted.EXCEPTION_RESOLVE_FIX:
+        ret = parted.EXCEPTION_RESOLVE_FIX
     return ret
 
 

setup.py

@@ -44,6 +44,17 @@ def findall(dirname=os.curdir):
 
 # Extend the sdist command
 class blivet_sdist(sdist):
+    user_options = sdist.user_options + [('mode=', None, "specify mode for sdist; one of 'release', 'normal'"),]
+
+    def initialize_options(self):
+        sdist.initialize_options(self)
+        self.mode = None
+
+    def finalize_options(self):
+        sdist.finalize_options(self)
+        if self.mode not in (None, 'release', 'normal'):
+            raise AttributeError('Unknown mode %s' % self.mode)
+
     def run(self):
         # Build the .mo files
         subprocess.check_call(['make', '-C', 'po'])
@@ -55,10 +66,11 @@ def make_release_tree(self, base_dir, files):
         # Run the parent command first
         sdist.make_release_tree(self, base_dir, files)
 
-        # Run translation-canary in release mode to remove any bad translations
-        sys.path.append('translation-canary')
-        from translation_canary.translated import testSourceTree  # pylint: disable=import-error
-        testSourceTree(base_dir, releaseMode=True)
+        if self.mode == "release":
+            # Run translation-canary in release mode to remove any bad translations
+            sys.path.append('translation-canary')
+            from translation_canary.translated import testSourceTree  # pylint: disable=import-error
+            testSourceTree(base_dir, releaseMode=True)
 
 
 data_files = [

tests/devicetree_test.py

@@ -6,7 +6,7 @@
 import unittest
 
 from blivet.actionlist import ActionList
-from blivet.errors import DeviceTreeError, DuplicateUUIDError
+from blivet.errors import DeviceTreeError, DuplicateUUIDError, InvalidMultideviceSelection
 from blivet.deviceaction import ACTION_TYPE_DESTROY, ACTION_OBJECT_DEVICE
 from blivet.devicelibs import lvm
 from blivet.devices import DiskDevice
@@ -541,5 +541,5 @@ def test_ignored_disks_multipath_3(self):
         self.tree.ignored_disks = ["sda", "sdb"]
         self.tree.exclusive_disks = []
 
-        with self.assertRaises(DeviceTreeError):
+        with self.assertRaises(InvalidMultideviceSelection):
             self.tree._hide_ignored_disks()