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

Timestamp:

Apr 11, 2016, 7:26:31 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Save timestamps of generated files in list.

This is used to check if the actual files match the ones that
were generated by rpmbuild-bot when performing uploading or
cleanup.

File:

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

rpmbuild-bot/rpmbuild-bot.sh

@@ -172 +172 @@
 }
 
+read_file_list()
+{
+  # $1 = file list list filename
+  # $2 = var name where to save read file names (optional)
+
+  local _read_file_list_ret=
+  # Check timestamps.
+  while read l; do
+    local f="${l#*|}"
+    local t="${l%%|*}"
+    [ "$f" = "$t" ] && die "Line '$l' in '$1' does not contain timestamps."
+    local a=`stat -c '%Y' "$f"`
+    if [ "$t" != "$a" ] ; then
+      die "Recorded timestamp $t doesn't match actual timestamp $a for file '$f'."
+    fi
+    _read_file_list_ret="$_read_file_list_ret${_read_file_list_ret:+ }$f"
+  done < "$1"
+  # Return the files (if requested).
+  [ -n "$2" ] && eval "$2=\$_read_file_list_ret"
+}
+
 usage()
 {
@@ -199 +220 @@
 
     echo "Detected successful build in $spec_list, cleaning up due to -f option..."
-    while read f; do
+    local files=
+    read_file_list "$spec_list" files
+    for f in $files; do
       echo "Removing $f..."
-      rm -f "$f"
-    done < "$spec_list"
+      run rm -f "$f"
+    done
+    unset files
 
     echo "Removing $log_base.*.log and .list files..."
@@ -259 +283 @@
   # Generate list of all generated packages for further reference.
   echo "Creating list file ($ver_list)..."
-  echo "$src_rpm" > "$ver_list"
-  echo "$zip" >> "$ver_list"
+  echo `stat -c '%Y' "$src_rpm"`"|$src_rpm" > "$ver_list"
+  echo `stat -c '%Y' "$zip"`"|$zip" >> "$ver_list"
   # Save base arch RPMs.
-  for f in "$rpms" ; do
-    echo "$f" >> "$ver_list"
+  for f in $rpms ; do
+    echo `stat -c '%Y' "$f"`"|$f" >> "$ver_list"
   done
   # Save other arch RPMs.
@@ -270 +294 @@
     [ -n "$rpms" ] || die "Cannot find .$arch.rpm file names in '$log_base.arch.log'."
     for f in $rpms ; do
-      echo "$f" >> "$ver_list"
+      echo `stat -c '%Y' "$f"`"|$f" >> "$ver_list"
     done
   done
@@ -323 +347 @@
     if [ -n "$rpms" ] ; then
       echo "Successfully generated the following RPMs:"
-      for f in "$rpms" ; do
+      for f in $rpms ; do
         echo "$f"
       done
@@ -346 +370 @@
   [ -f "$spec_list" ] || die \
 "File '$spec_list' is not found.
-You man need to build the packages using the 'build' command."
-
-  while read f; do
+You may need to build the packages using the 'build' command."
+
+  local files=
+  read_file_list "$spec_list" files
+  for f in $files; do
     case "$f" in
       *.src.rpm)
@@ -373 +399 @@
     echo "Copying $f to $d..."
     run cp -p "$f" "$d"
-  done < "$spec_list"
+  done
 
   # On success, delete the uploaded packages and archive log files.
-  while read f; do
+  for f in $files; do
     echo "Removing $f..."
-    rm -f "$f"
-  done < "$spec_list"
+    run rm -f "$f"
+  done
 
   # Note: versioned .list file will remain in archive forever (for further reference).