Hello community,
here is the log from the commit of package sblim-sfcb for openSUSE:Factory checked in at 2014-12-01 14:00:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old)
and /work/SRC/openSUSE:Factory/.sblim-sfcb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-sfcb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes 2014-09-17 21:25:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new/sblim-sfcb.changes 2014-12-01 14:00:47.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Nov 19 23:37:00 UTC 2014 - Led
+
+- fix bashisms in scripts
+- add patches:
+ * sblim-sfcb-1.4.8-fix-bashisms.patch
+
+-------------------------------------------------------------------
New:
----
sblim-sfcb-1.4.8-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-sfcb.spec ++++++
--- /var/tmp/diff_new_pack.5t1kOf/_old 2014-12-01 14:00:49.000000000 +0100
+++ /var/tmp/diff_new_pack.5t1kOf/_new 2014-12-01 14:00:49.000000000 +0100
@@ -52,6 +52,8 @@
Patch8: 0008-Increase-max-trace-msg-len-to-4096.patch
Patch10: 0010-Properly-shut-down-if-provider-crashed.patch
+Patch11: sblim-sfcb-1.4.8-fix-bashisms.patch
+
Provides: cim-server
Provides: cimserver
BuildRequires: cmpi-devel
@@ -122,6 +124,7 @@
%patch7 -p1
%patch8 -p1
%patch10 -p1
+%patch11 -p1
export PATCH_GET=0
++++++ sblim-sfcb-1.4.8-fix-bashisms.patch ++++++
diff -Ndur sblim-sfcb-1.4.8/sfcbrepos.sh.in sblim-sfcb-1.4.8-fix-bashisms/sfcbrepos.sh.in
--- sblim-sfcb-1.4.8/sfcbrepos.sh.in 2014-03-27 01:46:32.000000000 +0200
+++ sblim-sfcb-1.4.8-fix-bashisms/sfcbrepos.sh.in 2014-11-20 01:29:30.682816110 +0200
@@ -53,15 +53,15 @@
if [ "$help" = "1" ]
then
usage
- echo -e "\t-h display help message"
- echo -e "\t-f force repository creation"
- echo -e "\t-i do not migrate instances from previous repository (default=do migrate)"
- echo -e "\t-X create repository in non-native format as specifed by argument"
- echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
- echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
- echo -e "\t-t create tiny class repository by omitting inheritance information"
- echo -e "\t-z compress repository with gzip"
+ echo " -h display help message"
+ echo " -f force repository creation"
+ echo " -i do not migrate instances from previous repository (default=do migrate)"
+ echo " -X create repository in non-native format as specifed by argument"
+ echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]"
+ echo " -r specify repository directory [@localstatedir@/lib/sfcb/registration]"
+ echo " -c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
+ echo " -t create tiny class repository by omitting inheritance information"
+ echo " -z compress repository with gzip"
echo
echo "Use to create sfcb provider registration and class repository."
exit 0
diff -Ndur sblim-sfcb-1.4.8/sfcbstage.sh.in sblim-sfcb-1.4.8-fix-bashisms/sfcbstage.sh.in
--- sblim-sfcb-1.4.8/sfcbstage.sh.in 2014-03-27 01:46:32.000000000 +0200
+++ sblim-sfcb-1.4.8-fix-bashisms/sfcbstage.sh.in 2014-11-20 01:30:06.980816161 +0200
@@ -40,10 +40,10 @@
if [ "$help" = "1" ]
then
usage
- echo -e "\t-h display help message"
- echo -e "\t-n specify CIM namespace [root/cimv2]"
- echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
- echo -e "\t-r specify sfcb registration file"
+ echo " -h display help message"
+ echo " -n specify CIM namespace [root/cimv2]"
+ echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]"
+ echo " -r specify sfcb registration file"
echo
echo Use this command to copy registration files to the sfcb staging area.
exit 0
diff -Ndur sblim-sfcb-1.4.8/sfcbunstage.sh.in sblim-sfcb-1.4.8-fix-bashisms/sfcbunstage.sh.in
--- sblim-sfcb-1.4.8/sfcbunstage.sh.in 2014-03-27 01:46:32.000000000 +0200
+++ sblim-sfcb-1.4.8-fix-bashisms/sfcbunstage.sh.in 2014-11-20 01:30:37.343816203 +0200
@@ -41,10 +41,10 @@
if [ "$help" = "1" ]
then
usage
- echo -e "\t-h display help message"
- echo -e "\t-n specify CIM namespace [root/cimv2]"
- echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
- echo -e "\t-r specify sfcb registration file "
+ echo " -h display help message"
+ echo " -n specify CIM namespace [root/cimv2]"
+ echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]"
+ echo " -r specify sfcb registration file "
echo
echo Use this command to remove registration files from the sfcb staging area.
exit 0
diff -Ndur sblim-sfcb-1.4.8/sfcbuuid.sh.in sblim-sfcb-1.4.8-fix-bashisms/sfcbuuid.sh.in
--- sblim-sfcb-1.4.8/sfcbuuid.sh.in 2014-03-27 01:46:32.000000000 +0200
+++ sblim-sfcb-1.4.8-fix-bashisms/sfcbuuid.sh.in 2014-11-20 01:31:09.914816248 +0200
@@ -38,9 +38,9 @@
if [ "$help" = "1" ]
then
usage
- echo -e "\t-h display help message"
- echo -e "\t-f force uuid file creation"
- echo -e "\t-u specify uuid file name [@localstatedir@/lib/sfcb/uuid]"
+ echo " -h display help message"
+ echo " -f force uuid file creation"
+ echo " -u specify uuid file name [@localstatedir@/lib/sfcb/uuid]"
echo
echo "Use to create a universally unique identifier for sfcb."
exit 0
diff -Ndur sblim-sfcb-1.4.8/xmltest sblim-sfcb-1.4.8-fix-bashisms/xmltest
--- sblim-sfcb-1.4.8/xmltest 2014-03-27 01:46:35.000000000 +0200
+++ sblim-sfcb-1.4.8-fix-bashisms/xmltest 2014-11-20 01:35:39.824816621 +0200
@@ -30,8 +30,8 @@
fi
# ----------------------------------------------------------------------------
-function _runxmltest {
- typeset _TESTXML=$1
+_runxmltest() {
+ _TESTXML=$1
_TEST=${_TESTXML%.xml}
_TESTDIR=$( dirname $_TEST)
@@ -41,8 +41,9 @@
echo -n "Running test $_TESTXML ... "
# Make sure we will be able to write the result file
- if [[ ! -w $_TESTDIR ]]; then
- echo "FAILED"; echo -e "\tCannot write to $_TESTDIR"
+ if [ ! -w $_TESTDIR ]; then
+ echo "FAILED"
+ echo " Cannot write to $_TESTDIR"
continue
fi
@@ -52,21 +53,24 @@
# Send the test CIM-XML to the CIMOM and save the response,
# stripping off the http header
wbemcat $_TESTXML | awk '/<\?xml.*/{xml=1} {if (xml) print}' > $_TESTRESULT
- if [[ $? -ne 0 ]]; then
- echo "FAILED"; echo -e "\twbemcat failed to send CIM-XML request"
+ if [ $? -ne 0 ]; then
+ echo "FAILED"
+ echo " wbemcat failed to send CIM-XML request"
_RC=1
continue
fi
# If we dont yet have the expected result file, then save this response
# as the (new) expected result
- if [[ ! -f $_TESTOK ]]; then
- echo "OK"; echo -e "\tSaving response as $_TESTOK"
+ if [ ! -f $_TESTOK ]; then
+ echo "OK"
+ echo " Saving response as $_TESTOK"
mv $_TESTRESULT $_TESTOK
# Compare the response XML against the expected XML for differences
elif ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then
- echo "FAILED"; echo -e "\tCheck $_TESTRESULT for errors"
+ echo "FAILED"
+ echo " Check $_TESTRESULT for errors"
_RC=1;
continue
@@ -78,10 +82,10 @@
}
# ----------------------------------------------------------------------------
-if [[ -f $1 ]]; then
+if [ -f $1 ]; then
_runxmltest $1
else
- if [[ -d $1 ]]; then
+ if [ -d $1 ]; then
_DIR=$1
else
_DIR=./
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org