Changeset 1032 for rpmbuild-bot

Timestamp:

Feb 24, 2017, 11:42:01 PM (8 years ago)

Author:

dmik

Message:

rpmbuild-bot: Use -a in grep to force text file mode.

This is to protect from cases when some tool (like emxomf in verbose mode)
outputs non-printable chars during the build process which makes grep interpret
the file as binary which breaks generated RPM file detection.

File:

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

rpmbuild-bot/rpmbuild-bot.sh

@@ -467 +467 @@
     log_run "$log_base.$arch.log" rpmbuild.exe --target=$arch -bb "$spec_full"
     print_elapsed start_time "Completed in \$e."
-    if ! grep -q "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" ; then
-      if ! grep -q "^Wrote: \+.*\.noarch\.rpm$" "$log_base.$arch.log" ; then
+    if ! grep -a -q "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" ; then
+      if ! grep -a -q "^Wrote: \+.*\.noarch\.rpm$" "$log_base.$arch.log" ; then
         die "Target '$arch' did not produce any RPMs."
       fi
@@ -484 +484 @@
 
   # Find SRPM file name in the log.
-  local src_rpm=`grep "^Wrote: \+.*\.src\.rpm$" "$log_base.srpm.log" | sed -e "s#^Wrote: \+##g"`
+  local src_rpm=`grep -a "^Wrote: \+.*\.src\.rpm$" "$log_base.srpm.log" | sed -e "s#^Wrote: \+##g"`
   [ -n "$src_rpm" ] || die "Cannot find .src.rpm file name in '$log_base.srpm.log'."
 
@@ -497 +497 @@
 
   # 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_base.$base_arch.log" | sed -e "s#^Wrote: \+##g"`"
+  local rpms="`grep -a "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_base.$base_arch.log" | sed -e "s#^Wrote: \+##g"`"
   [ -n "$rpms" ] || die "Cannot find .$base_arch.rpm/.noarch.rpm file names in '$log_base.base_arch.log'."
 
@@ -535 +535 @@
   if [ -z "$noarch_only" ] ; then
     for arch in ${arch_list%${base_arch}} ; do
-      rpms="`grep "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`"
+      rpms="`grep -a "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`"
       [ -n "$rpms" ] || die "Cannot find .$arch.rpm file names in '$log_base.arch.log'."
       for f in $rpms ; do
@@ -591 +591 @@
   if [ "$command_arg" = "all" -o "$command_arg" = "pack" ] ; then
     # 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"`"
+    local rpms="`grep -a "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`"
     if [ -n "$rpms" ] ; then
       echo "Successfully generated the following RPMs:"
@@ -729 +729 @@
 
     # 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"`"
+    local rpms="`grep -a "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`"
     if [ -n "$rpms" ] ; then
       for f in $rpms; do