[corey.bryant, r=gnuoy] charmhelper sync

2015-06-26 09:20:28 +01:00
parent 36cf8d08fa 19ab17c378
commit 5f5dc55f0d
2 changed files with 3 additions and 1 deletions
--- a/charm-helpers-tests.yaml
+++ b/charm-helpers-tests.yaml
@@ -1,4 +1,4 @@
-branch: lp:charm-helpers 
+branch: lp:charm-helpers
 destination: tests/charmhelpers
 include:
    - contrib.amulet
--- a/hooks/charmhelpers/contrib/python/packages.py
+++ b/hooks/charmhelpers/contrib/python/packages.py
@@ -36,6 +36,8 @@ __author__ = "Jorge Niedbalski <jorge.niedbalski@canonical.com>"
 def parse_options(given, available):
    """Given a set of options, check if available"""
    for key, value in sorted(given.items()):
+        if not value:
+            continue
        if key in available:
            yield "--{0}={1}".format(key, value)