From 6ffe845af8ff9ae68a2500a3b2a2121f79cc2cba Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 28 Mar 2014 07:41:53 -0400 Subject: [PATCH] Avoid newlines in rpm_packages but handle them if they appear --- rpm-builder | 1 + rpm_packages | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 -- 2.1.4