Changeset 744 for rpmbuild-bot/rpmbuild-bot.sh

Timestamp:

Apr 15, 2016, 4:20:30 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Fix another bad variable name error (in test/clean)

See also r728.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (3 diffs)

rpmbuild-bot/rpmbuild-bot.sh

@@ -92 +92 @@
 #   pack    Create the RPM packages (requires "prep", "build" and "install"
 #           to be executed before). Note that this step will also execute
-#           the %clean section so that a new "build" + "install" execution is
+#           the %clean section so that a new "install" execution is
 #           necessary for "pack" to succeed.
 #
@@ -383 +383 @@
   # Show the generated RPMs when appropriate.
   if [ "$command_arg" = "all" -o "$command_arg" = "pack" ] ; then
-    local rpms=`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`
+    # Find all RPM packages for the base arch (note the quotes around `` - it's to preserve multi-line result).
+    local rpms="`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`"
     if [ -n "$rpms" ] ; then
       echo "Successfully generated the following RPMs:"
@@ -474 +475 @@
     [ -f "$log_file" ] || die "File '$test_log' is not found."
 
-    local rpms=`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`
+    # Find all RPM packages for the base arch (note the quotes around `` - it's to preserve multi-line result).
+    local rpms="`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`"
     if [ -n "$rpms" ] ; then
       for f in $rpms; do