Merge branch 'main' of https://github.com/performancecopilot/pcp

qa/1370

@@ -134,6 +134,9 @@ for cmd in $(cat $tmp.cmds.txt); do
 	pcp-atop)
 	    [ X"$opt" = X--pcp-flags ] && continue
 	    ;;
+	pcp-xsos)
+	    [ X"$opt" = X--start ] && continue
+	    ;;
 	pcp)
 	    # all these long options are documented in PCPIntro(1)
 	    # and pcp(1) points there, rather than repeating them

qa/group

@@ -1956,7 +1956,7 @@ x11
 1487 pmda.linux local valgrind
 1488 other local
 1489 python pmrep pmimport local
-1490 python local labels valgrind
+1490:retired python local labels valgrind
 1491 pmcheck local
 1492 pcp atopsar local multi-archive
 1493 pcp atopsar local valgrind multi-archive

src/pmdas/elasticsearch/Upgrade

@@ -19,7 +19,7 @@
 
 if grep -q ^elasticsearch "$PCP_PMCDCONF_PATH" 2>/dev/null
 then
-    if grep '^elasticsearch.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
+    if grep ^elasticsearch "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else

src/pmdas/mssql/Upgrade

@@ -24,9 +24,9 @@ then
 	-e "s,perl $PCP_PMDAS_DIR/mssql/pmdamssql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/pmdamssql.python,g"
 fi
 
-if grep -q '^mssql.*python ' "$PCP_PMCDCONF_PATH" 2>/dev/null
+if grep -q ^mssql "$PCP_PMCDCONF_PATH" 2>/dev/null
 then
-    if grep '^mssql.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
+    if grep ^mssql "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else

src/pmdas/openmetrics/Upgrade

@@ -36,9 +36,9 @@ then
     rm -f "$PCP_VAR_DIR/pmns/prometheus" 2>/dev/null
 fi
 
-if grep -q '^openmetrics.*python ' "$PCP_PMCDCONF_PATH" 2>/dev/null
+if grep -q ^openmetrics "$PCP_PMCDCONF_PATH" 2>/dev/null
 then
-    if grep '^openmetrics.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
+    if grep ^openmetrics "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else

src/pmdas/postgresql/Upgrade

@@ -25,9 +25,9 @@ then
 	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
 	    -e "s,perl $PCP_PMDAS_DIR/postgresql/pmdapostgresql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/pmdapostgresql.python,g"
     fi
-    if grep -q '^postgresql.*python ' "$PCP_PMCDCONF_PATH" 2>/dev/null
+    if grep -q ^postgresql "$PCP_PMCDCONF_PATH" 2>/dev/null
     then
-	if grep '^postgresql.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
+	if grep ^postgresql "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
 	then
 	    :	# already using $PCP_PYTHON_PROG, leave this line untouched
 	else