Merge ~morphis/snappy-hwe-snaps/+git/build-scripts:b/check-arguments-correctly into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

[Simon Fels]

Correct argument handling to properly check for available arguments.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:92b9990e7fbc967aa304337465057872837f4fe7
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1073/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/74
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/781
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/981/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/780

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1073/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

diff --git a/jobs/generic-release-snap b/jobs/generic-release-snap
index 7140be5..45d7507 100755
--- a/jobs/generic-release-snap
+++ b/jobs/generic-release-snap
@@ -58,6 +58,4 @@ git push origin stable
 git push origin master
 git push origin $VERSION
 
-
-
 exec $WORKSPACE/build-scripts/scripts/trigger-lp-build.py -s $SNAP_NAME -p
diff --git a/scripts/trigger-lp-build.py b/scripts/trigger-lp-build.py
index ed3d3e8..2de16e3 100755
--- a/scripts/trigger-lp-build.py
+++ b/scripts/trigger-lp-build.py
@@ -33,7 +33,7 @@ ephemeral_build=False
 
 if args['new']:
     ephemeral_build=True
-    if not 'git_repo' in args or not 'git_repo_branch' in args:
+    if args['git_repo'] == None or args['git_repo_branch'] == None:
         print("ERROR: No git repository or a branch supplied")
         sys.exit(1)
 
@@ -52,7 +52,7 @@ primary_archive = ubuntu.getArchive(name='primary')
 snap=None
 if ephemeral_build:
     snap_arches=[]
-    if 'architectures' in args and len(args['architectures']) > 0:
+    if 'architectures' in args and args['architectures'] != None:
         snap_arches = args["architectures"].split(",")
 
     if len(snap_arches) == 0:
@@ -86,7 +86,7 @@ if snap == None:
 
 # Not every snap is build agains all arches.
 arches = [processor.name for processor in snap.processors]
-if not ephemeral_build and "architectures" in args:
+if not ephemeral_build and args['architectures'] != None:
     wanted_arches = args["architectures"].split(",")
     possible_arches = []
     for arch in wanted_arches: