Merge lp:~ericsnowcurrently/landscape-client/fix-1681947-script-shbang into lp:~landscape/landscape-client/trunk

[Eric Snow]

Only build the scripts under Python 3.

(fixes lp:1681947)

Only build the scripts under Python 3.

(fixes lp:1681947)

Testing instructions:

make package
head debian/tmp/usr/bin/landscape-client # shbang will be python3

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make ci-check
Result: Success
Revno: 1015
Branch: lp:~ericsnowcurrently/landscape-client/fix-1681947-script-shbang
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3872/

review: Approve (test results)

[Francis Ginther (fginther)]

Yep, it works.

review: Approve

[Simon Poirier (simpoir)]

+1

review: Approve

=== modified file 'setup.py'
--- setup.py	2017-04-06 18:50:19 +0000
+++ setup.py	2017-04-11 21:35:23 +0000
@@ -1,12 +1,29 @@
 #!/usr/bin/python
 
 from distutils.core import setup
+import sys
 
 from landscape import UPSTREAM_VERSION
 
 from DistUtilsExtra.command import build_extra
 from DistUtilsExtra.auto import clean_build_tree
 
+
+SCRIPTS = []
+if sys.version_info[0] == 3:
+    SCRIPTS = [
+            "scripts/landscape-client",
+            "scripts/landscape-config",
+            "scripts/landscape-broker",
+            "scripts/landscape-manager",
+            "scripts/landscape-monitor",
+            "scripts/landscape-package-changer",
+            "scripts/landscape-package-reporter",
+            "scripts/landscape-release-upgrader",
+            "scripts/landscape-sysinfo",
+            ]
+
+
 setup(name="Landscape Client",
       version=UPSTREAM_VERSION,
       description="Landscape Client",
@@ -23,14 +40,6 @@
                 "landscape.upgraders",
                 "landscape.user",
                 "landscape.lib"],
-      scripts=["scripts/landscape-client",
-               "scripts/landscape-config",
-               "scripts/landscape-broker",
-               "scripts/landscape-manager",
-               "scripts/landscape-monitor",
-               "scripts/landscape-package-changer",
-               "scripts/landscape-package-reporter",
-               "scripts/landscape-release-upgrader",
-               "scripts/landscape-sysinfo"],
+      scripts=SCRIPTS,
       cmdclass={"build": build_extra.build_extra,
                 "clean": clean_build_tree})