[X2Go-Commits] [python-x2go] 01/02: python-x2go.spec: fix fallback detection.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 1 10:21:22 CET 2020


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit b2c50d93cf579227325230c28d6669d0160d476e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 1 10:20:05 2020 +0100

    python-x2go.spec: fix fallback detection.
    
    We want to fall back if the variables are empty, not set.
---
 debian/changelog | 2 ++
 python-x2go.spec | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef5d682..80454f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
     + Correctly check for existance of %{python2_version}.
     + Add Python-3-autodetection via %{python3_version} and fallbacks to
       %{py3_ver} and yet another to the plain "3" postfix.
+    + Fix fallback detection. We want to fall back if the variables are empty,
+      not set.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 26 Dec 2019 10:37:02 +0100
 
diff --git a/python-x2go.spec b/python-x2go.spec
index aa568da..8ac139f 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -275,9 +275,9 @@ python3 setup.py build
 # Older distros, especially *SuSE versions, do not support %{python3_version},
 # though, so we will have to use %{py3_ver} instead.
 sphinx_postfix='%{?python3_version}'
-if [ -n "${sphinx_postfix}" ]; then
+if [ -z "${sphinx_postfix}" ]; then
   sphinx_postfix='%{?py3_ver}'
-  if [ -n "${sphinx_postfix}" ]; then
+  if [ -z "${sphinx_postfix}" ]; then
     # And if not even that exists, fall back to the plain -3 postfix.
     sphinx_postfix='3'
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list