Accepting request 601836 from filesystems:ceph:mimic

13.0.2-1874

OBS-URL: https://build.opensuse.org/request/show/601836
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=183

checkin.sh

@@ -29,7 +29,7 @@ function usage {
 }
 
 function _error_exit {
-    echo $1
+    echo >&2 $1
     exit $2
 }
 
@@ -50,14 +50,13 @@ function _verify_git_describe {
     echo "Does this version number looks sane? y/[N]"
     read a
     if [ "x$a" != "xy" ] ; then
-        echo "Aborting!"
-        exit 1
+        _error_exit "Aborting!" 1
     fi
 }
 
 GETOPT=$(getopt -o b:e:hr: --long "branch:,existing:,help,repo:" \
        -n 'checkin.sh' -- "$@")
-if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+test "$?" -eq 0 || _error_exit "Terminating..." 1
 eval set -- "$GETOPT"
 
 EXISTING=""
@@ -90,7 +89,8 @@ if [ -n "$EXISTING" ] ; then
     CLONE="$EXISTING"
 else
     echo "Will make fresh clone of repo ->$REPO<- branch ->$BRANCH<-"
-    TMPDIR=$(mktemp -d --tmpdir=$BASEDIR)
+    #TMPDIR=$(mktemp -d --tmpdir=$BASEDIR)
+    TMPDIR=$(mktemp -d)
     echo "Created temporary temporary $TMPDIR"
     git clone --branch $BRANCH $REPO $TMPDIR
     CLONE="$TMPDIR"
@@ -111,13 +111,11 @@ echo "Running \"osc rm *bz2\" to nuke previous tarball"
 if type osc > /dev/null 2>&1 ; then
     osc rm *bz2
 else
-    echo "ERROR: osc not installed"
-    exit 1
+    _error_exit "osc not installed - cannot continue" 1
 fi
 
 if stat --printf='' *.bz2 2>/dev/null ; then
-    echo "There are still files ending in bz2 in the current directory - clean up yourself!"
-    exit 1
+    _error_exit "There are still files ending in bz2 in the current directory - clean up yourself!" 1
 fi
 
 echo "Copying new spec file and tarball from $CLONE"
@@ -139,4 +137,3 @@ else
 fi
 
 echo "Done! Run \"osc ci --noservice\" to commit."
-