[Xfce4-commits] [apps/catfish] 01/01: Apply release build overrides only when doing releases

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/catfish.

commit 2ba79a033c5ae3c28bc5e8097ee6a0432e9d52c5
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Dec 26 05:16:14 2019 -0500

    Apply release build overrides only when doing releases
---
 po/catfish.pot |  2 +-
 setup.py       | 25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/po/catfish.pot b/po/catfish.pot
index 0ffeae5..3a612dc 100644
--- a/po/catfish.pot
+++ b/po/catfish.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-24 14:01-0500\n"
+"POT-Creation-Date: 2019-12-26 05:13-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/setup.py b/setup.py
index f18ccb1..7a4cfd0 100644
--- a/setup.py
+++ b/setup.py
@@ -196,20 +196,19 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
         cleanup_metainfo_files(self.root, target_data)
         os.remove(metainfo)
 
-# Hacky, default releases to bztar
-if "--formats" not in " ".join(sys.argv[1:]):
-    sys.argv.append("--formats=bztar")
-    default_build = True
-else:
-    default_build = False
-
 # Verify the build directory is clean
+folder = "dist/catfish-%s" % release_version
+if os.path.exists(folder):
+    sys.stderr.write("Build directory 'dist' is not clean.\n"
+                     "Please manually remove %s" % folder)
+    sys.exit(1)
+
+# Hacky, default releases to bztar
+default_release_build = False
 if "sdist" in sys.argv:
-    folder = "dist/catfish-%s" % release_version
-    if os.path.exists(folder):
-        sys.stderr.write("Build directory 'dist' is not clean.\n"
-                         "Please manually remove %s" % folder)
-        sys.exit(1)
+    if "--formats" not in " ".join(sys.argv[1:]):
+        sys.argv.append("--formats=bztar")
+        default_release_build = True
 
 DistUtilsExtra.auto.setup(
     name='catfish',
@@ -231,7 +230,7 @@ DistUtilsExtra.auto.setup(
 )
 
 # Simplify Xfce release process by providing sums
-if default_build and "sdist" in sys.argv:
+if default_release_build:
     import hashlib
 
     bzfile = "dist/catfish-%s.tar.bz2" % release_version

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.