From 4902ab352f6622a28525557bdd346ca4ac8cf599 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 2 Oct 2022 12:47:45 +0200
Subject: [PATCH] autodist, autoport: update to current production code

---
 autodist | 21 ++++++++++++---------
 autoport |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/autodist b/autodist
index 586df8e..72e6909 100755
--- a/autodist
+++ b/autodist
@@ -123,13 +123,6 @@ for ((i=1; i<=$#; i++)); do
                       do_build=1;
                       do_send=1; 
                       SEVERITY=1
-		      [ -e $PIDFILE ] && {
-	                 PIDCHECK=`cat $PIDFILE`
-		         [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ] && {
-		            echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
-		            exit 1
-		         }
-		      }
 		      ;;
       -c|--cleanlogs) do_cleanlogs=1 ;;
       -h|--help) usage 
@@ -236,6 +229,16 @@ for ((i=1; i<=$#; i++)); do
    esac
 done
 
+if [ "$do_autobuild" ]; then
+   if [ -e $PIDFILE ]; then
+      PIDCHECK=`cat $PIDFILE`
+      if [ "$PIDCHECK" -a -e /proc/$PIDCHECK -a ! "$DISABLE_PID_CHECK" ]; then
+         echo "Error: autodist -a already running with PID=$PIDCHECK.Aborting."
+         exit 0
+      fi
+   fi
+fi
+
 [ "$AUTODIST_REPOSITORY" ] || AUTODIST_REPOSITORY=devel-autodist
 [ "$SEND_SERVER" ] || SEND_SERVER=$AUTODIST_REPOSITORY
 
@@ -1133,8 +1136,8 @@ if [ "$do_autobuild" = "1" ]; then
        [ $AUTOBUILD_NUMADDED -ge $AUTOBUILD_MAXNUM ] && break
 
        # FIXME: hardcoded skipped packages
-       [ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \
-         "${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue
+       #[ "${PKGNAME:0:5}" = "java-" -o "${PKGNAME:0:7}" = "apache-" -o \
+       # "${PKGNAME:0:8}" = "jakarta-" -o "${PKGNAME:0:6}" = "compiz" ] && continue
 
        if [ $BUILDDATE -ge $AUTOBUILD_DATEFROM -o $BUILDDATE -eq 0 ]; then
           AUTOBUILD_NUMADDED=`expr $AUTOBUILD_NUMADDED + 1`
diff --git a/autoport b/autoport
index 1a1951e..7b558f2 100755
--- a/autoport
+++ b/autoport
@@ -400,7 +400,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
          port_pkg_version=$pkg_version
          port_pkg_release=$pkg_release
          currrebuild=
-         currjobsscriptargs=
+         currjobscriptargs=
          JOBNUM=0
          for p in ${port_pkg_list}; do
             if [ "${p/@*}" != "$currrebuild" ]; then
@@ -589,7 +589,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
                echo -n "update"
                if [ "$REBUILD_DEPENDANT_MODE" ]; then
                   SCRIPT_ARGS="${JOB_SCRIPTARGS[$JOB_NUM-1]}"
-                  changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|;s| ||g;s|^,||g"`"
+                  changelogadd="`echo ${SCRIPT_ARGS} | sed "s|--buildreq|,|g;s| ||g;s|^,||g"`"
                   REBUILD_CHANGELOG="rebuilt by autoport with build requirements: '${changelogadd}'"
                fi
                [ "$VERBOSE_MODE" ] && echo "