Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sca-appliance-broker for
openSUSE:Factory checked in at 2021-03-17 20:16:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sca-appliance-broker (Old)
and /work/SRC/openSUSE:Factory/.sca-appliance-broker.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sca-appliance-broker"
Wed Mar 17 20:16:07 2021 rev:5 rq:879463 version:1.3.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/sca-appliance-broker/sca-appliance-broker.changes
2021-03-15 10:54:53.517216991 +0100
+++
/work/SRC/openSUSE:Factory/.sca-appliance-broker.new.2401/sca-appliance-broker.changes
2021-03-17 20:19:51.891310133 +0100
@@ -1,0 +2,5 @@
+Tue Mar 16 15:53:48 UTC 2021 - [email protected]
+
+- Correctly check for the web and scripting module (bsc#1183601)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sca-appliance-broker-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sca-appliance-broker-1.3.1/bin/setup-sca
new/sca-appliance-broker-1.3.1/bin/setup-sca
--- old/sca-appliance-broker-1.3.1/bin/setup-sca 2021-03-12
23:01:47.789565631 +0100
+++ new/sca-appliance-broker-1.3.1/bin/setup-sca 2021-03-15
22:03:32.509741041 +0100
@@ -1,6 +1,6 @@
#!/bin/bash
-SVER='1.0.40'
+SVER='1.0.43'
##############################################################################
# setup-sca - SCA Appliance Setup Tool
@@ -8,7 +8,7 @@
#
# Description: Sets up a standard local host configuration of the SCA
# appliance
-# Modified: 2018 Mar 12
+# Modified: 2021 Mar 15
#
##############################################################################
#
@@ -32,6 +32,7 @@
CURRENT_ARGS="$*"
CRON_COMBINED="/usr/share/doc/packages/sca-appliance-broker/combined.cron"
PHP_VERSION=''
+WEB_MODULE=0
SERVER=$(hostname -f &>/dev/null)
[[ -z "$SERVER" ]] && SERVER=$HOSTNAME
ARCH_PREFIX='scc_'
@@ -108,6 +109,20 @@
echo
}
+checkWebModule() {
+ printf "$FMT2" "Web Module"
+ if zypper lr 2>/dev/null | egrep -i
"web-scripting-module|module-web-scripting" &>/dev/null
+ then
+ echo 'Installed'
+ WEB_MODULE=1
+ else
+ echo 'Not Installed'
+ echo; echo " Install the Web and Scripting Module repository";
echo
+ echo " Run: SUSEConnect --list-extensions"; echo
+ FATAL_ERROR=1
+ fi
+}
+
getPHPVersion() {
printf "$FMT2" "PHP Version"
FOUND_VERSION=0
@@ -123,7 +138,7 @@
echo $PHP_VERSION
else
echo "ERROR"
- PHP_VERSION='_unknown_'
+ PHP_VERSION='_php_'
FATAL_ERROR=1
fi
}
@@ -181,19 +196,11 @@
fi
if [[ -n "$MISSING_PACKAGES" ]]; then
echo 'ERROR'
- printf "$FMT1" " Missing required packages:"
"$MISSING_PACKAGES"
- echo
- FATAL_ERROR=1
-
- printf "$FMT2" "Web Module"
- if zypper lr 2>/dev/null | egrep -i
"web-scripting-module|module-web-scripting" &>/dev/null
- then
- echo 'Installed'
- WEB_MODULE=1
- else
- echo 'Not Installed'
- echo; echo " Install the Web and Scripting Module
repository"; echo
+ if (( $WEB_MODULE )); then
+ printf "$FMT1" " Missing required packages:"
"$MISSING_PACKAGES"
+ echo; echo " Run: zypper install $MISSING_PACKAGES";
echo
fi
+ FATAL_ERROR=1
else
echo Installed
fi
@@ -566,6 +573,7 @@
############################################################################
title
serverAccess
+checkWebModule
getPHPVersion
phpCheck
packageCheck
