commit cc271ebb6d88ba5d1b1c465ad0b003bc095b61b1 Author: Michal Srb msrb@redhat.com Date: Wed Jan 14 18:22:07 2015 +0100
Be defensive, watch out for None
python/javapackages/common/osgi.py | 5 ++--- python/javapackages/common/util.py | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) --- diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index 35c4f34..760c587 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -42,9 +42,8 @@ class OSGiUtils(object):
@staticmethod def get_rpm_str(bundle, version="", namespace=""): - ns = namespace - if version: - version = sanitize_version(version) + ns = namespace or "" + version = sanitize_version(version) return "{ns}{d}osgi({bundle}){eq}{version}".format(ns=ns, d="-" if ns else "", bundle=bundle, diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py index 994fc30..4ad5474 100644 --- a/python/javapackages/common/util.py +++ b/python/javapackages/common/util.py @@ -142,4 +142,6 @@ def write_metadata(fileobj, metadata):
def sanitize_version(version): - return version.replace("-", ".") + if version: + return version.replace("-", ".") + return ""
java-sig-commits@lists.fedoraproject.org