Merge pull request #821 from mulkieran/patch-2.4.1-2.4.4

New version: 2.4.4

.github/workflows/main.yml

@@ -7,10 +7,22 @@ on:
     branches:
       - master
       - patch-2.4.1
+    paths-ignore:
+      - 'CHANGES.txt'
+      - '**/README.rst'
+      - 'LICENSE'
+      - 'docs/**'
+      - 'shell-completion/**'
   pull_request:
     branches:
       - master
       - patch-2.4.1
+    paths-ignore:
+      - 'CHANGES.txt'
+      - '**/README.rst'
+      - 'LICENSE'
+      - 'docs/**'
+      - 'shell-completion/**'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

CHANGES.txt

@@ -1,3 +1,9 @@
+stratis-cli 2.4.4
+=================
+Recommended development environment: Fedora 33
+Lowest supported Python interpreter: 3.6.8
+
+
 stratis-cli 2.4.3
 =================
 Recommended development environment: Fedora 33

docs/Makefile

@@ -1,4 +1,2 @@
-
-
 stratis.8: stratis.txt
 	a2x -f manpage stratis.txt

docs/stratis.txt

@@ -164,6 +164,8 @@ Properties::
           "?", representing "unknown", is prepended to the property code.
           The property codes are: Ca - indicates the pool has a cache,
           Cr - indicates the pool is encrypted.
+UUID::
+          The UUID of the pool.
 
 FIELDS for stratis filesystem list
 

setup.py

@@ -16,18 +16,19 @@ def local_file(name):
     return os.path.relpath(os.path.join(os.path.dirname(__file__), name))
 
 
-README = local_file("README.rst")
-
 with open(local_file("src/stratis_cli/_version.py")) as o:
     exec(o.read())  # pylint: disable=exec-used
 
+with open(local_file("README.rst"), encoding="utf-8") as o:
+    long_description = o.read()
+
 setuptools.setup(
     name="stratis-cli",
     version=__version__,  # pylint: disable=undefined-variable
     author="Anne Mulhern",
     author_email="[email protected]",
     description="Stratis CLI",
-    long_description=open(README, encoding="utf-8").read(),
+    long_description=long_description,
     platforms=["Linux"],
     license="Apache 2.0",
     classifiers=[
@@ -49,6 +50,7 @@ def local_file(name):
         "dbus-client-gen>=0.4",
         "dbus-python-client-gen>=0.7",
         "justbytes>=0.14",
+        "psutil",
         "python-dateutil",
         "semantic_version",
         "wcwidth",

src/stratis_cli/_error_reporting.py

@@ -113,8 +113,32 @@ def _interpret_errors_0(error):
             "Most likely stratis has insufficient permissions for the action requested."
         )
 
+    # We have observed three causes of this problem. The first is that
+    # stratisd is not running at all. The second is that stratisd has not
+    # yet established its D-Bus service. The third is that stratisd is
+    # running with a new major version and is supplying a different name on the
+    # D-Bus than stratis is attempting to use. The second and third
+    # possibilities are both covered by a single error message.
     if error.get_dbus_name() == "org.freedesktop.DBus.Error.NameHasNoOwner":
-        return "Most likely there is no stratisd process running."
+        try:
+            # pylint: disable=import-outside-toplevel
+            # isort: THIRDPARTY
+            import psutil
+
+            for proc in psutil.process_iter():
+                try:
+                    if proc.name() == "stratisd":  # pragma: no cover
+                        return (
+                            "Most likely stratis is unable to connect to the "
+                            "stratisd D-Bus service."
+                        )
+                except psutil.NoSuchProcess:  # pragma: no cover
+                    pass
+
+            return "It appears that there is no stratisd process running."
+
+        except ImportError:  # pragma: no cover
+            return "Most likely there is no stratisd process running."
 
     # Due to the uncertain behavior with which libdbus
     # treats a timeout value of 0, it proves difficult to test this case,

src/stratis_cli/_version.py

@@ -17,5 +17,5 @@
     .. moduleauthor::  mulhern  <[email protected]>
 """
 
-__version_info__ = (2, 4, 3)
+__version_info__ = (2, 4, 4)
 __version__ = ".".join(str(x) for x in __version_info__)