From: Sam Hartman Date: Fri, 28 Mar 2014 11:41:53 +0000 (-0400) Subject: Avoid newlines in rpm_packages X-Git-Tag: v0.9.6~74 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=6ffe845af8ff9ae68a2500a3b2a2121f79cc2cba;hp=85548f5abb6b554d8ba1627e12c8bbc903a32ab9 Avoid newlines in rpm_packages but handle them if they appear --- diff --git a/rpm-builder b/rpm-builder index e7a9d91..5492784 100755 --- a/rpm-builder +++ b/rpm-builder @@ -64,6 +64,7 @@ def find_type(name): # def trim_target(t): match = re.match('([^/-]*/)?([^-/]+)', t) + if match is None: return "" return match.group(2) diff --git a/rpm_packages b/rpm_packages index c0c4e3e..6571dfb 100644 --- a/rpm_packages +++ b/rpm_packages @@ -11,5 +11,4 @@ moonshot-ui mech_eap trust_router freeradius-server - #cyrus-sasl