Merge branch 'release-0.12.2'

Author: rhodesn

auter

@@ -19,7 +19,7 @@
 #
 
 
-declare -r -x AUTERVERSION="0.12.1"
+declare -r -x AUTERVERSION="0.12.2"
 declare -r -x SCRIPTDIR="/etc/auter"
 declare -r -x DATADIR="/var/lib/auter"
 declare -r -x LOCKFILE="${DATADIR}/enabled"

auter.spec

@@ -1,5 +1,5 @@
 Name:           auter
-Version:        0.12.1
+Version:        0.12.2
 Release:        1%{?dist}
 Summary:        Prepare and apply updates
 License:        ASL 2.0
@@ -101,6 +101,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Feb 12 2019 Nick Rhodes <[email protected]> 0.12.2-1
+- #207 check for process matching PID file content
+
 * Tue Dec 11 2018 Nick Rhodes <[email protected]> 0.12.1-1
 - Add max-delay option to override MAXDLAY via command line
 - Redirect stderr to stdout and capture in APPLYOUTPUT variable

auter.yumdnfModule

@@ -19,17 +19,19 @@ function check_package_manager_lock() {
   [[ "${PACKAGEMANAGERLOCKWAITTIME}" -lt 1 ]] && PACKAGEMANAGERLOCKWAITTIME=60
 
   if [[ -f /var/run/yum.pid ]]; then
-    for LOCKCHECKATTEMPT in $(seq 1 $((PACKAGEMANAGERLOCKRETRIES + 1))); do
-      # If this has reached the retry limit configured then abort
-      if [[ ${LOCKCHECKATTEMPT} -eq $((PACKAGEMANAGERLOCKRETRIES + 1)) ]]; then
-        logit "ERROR: Final attempt to wait for yum to release lock file failed. Aborting auter run"
-        quit 3
-      fi
+    if { pgrep --pidfile /var/run/yum.pid &>/dev/null ; } ; then
+      for LOCKCHECKATTEMPT in $(seq 1 $((PACKAGEMANAGERLOCKRETRIES + 1))); do
+        # If this has reached the retry limit configured then abort
+        if [[ ${LOCKCHECKATTEMPT} -eq $((PACKAGEMANAGERLOCKRETRIES + 1)) ]]; then
+          logit "ERROR: Final attempt to wait for yum to release lock file failed. Aborting auter run"
+          quit 3
+        fi
 
-      logit "INFO: /var/run/yum.pid exists. Waiting ${PACKAGEMANAGERLOCKWAITTIME} seconds for yum lock to be released: Attempt ${LOCKCHECKATTEMPT} of ${PACKAGEMANAGERLOCKRETRIES}"
-      sleep ${PACKAGEMANAGERLOCKWAITTIME}
-      [[ ! -f /var/run/yum.pid ]] && logit "INFO: yum lock has been released" && break
-    done
+        logit "INFO: /var/run/yum.pid exists and process runnning. Waiting ${PACKAGEMANAGERLOCKWAITTIME} seconds for yum lock to be released: Attempt ${LOCKCHECKATTEMPT} of ${PACKAGEMANAGERLOCKRETRIES}"
+        sleep ${PACKAGEMANAGERLOCKWAITTIME}
+        { pgrep --pidfile /var/run/yum.pid &>/dev/null ; } || { logit "INFO: yum lock has been released" && break ; }
+      done
+    fi
   fi
 }