$PACKAGE.spec saved."
+ RET=-1
+ ;;
"smartupgrade") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "export LANG=C;sudo smart update && sudo smart upgrade"
RET=$?
;;
+ "runldconfig") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "/sbin/ldconfig"
+ RET=$?
+ ;;
"showpatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE"; RET=$? ;;
"removepatch") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autodist-tool makepatch $PACKAGE remove"
RET=$?
@@ -1278,7 +1374,7 @@ case $REQUEST in
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool schedule $AUTODISTJOB"
RET=$?
if [ $RET -eq 0 ]; then
- social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"scheduled autodist job
$PAUTODISTJOB for automatic update\" STIME=`date +%s`"
+ social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"scheduled autodist job
$AUTODISTJOB for automatic update\" STIME=`date +%s`"
fi
fi
;;
@@ -1287,11 +1383,6 @@ case $REQUEST in
if [ $RET -eq 0 ]; then
social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"unscheduled autodist job
$AUTODISTJOB\" STIME=`date +%s`"
fi ;;
- "skip") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autodist-tool skip $AUTODISTJOB"
- RET=$?
- if [ $RET -eq 0 ]; then
- social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"added autodist job
$AUTODISTJOB to skipped list\" STIME=`date +%s`"
- fi ;;
"autodistbuild") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=
autodistjobs=
if [ "$AUTODISTPKGS" ]; then
@@ -1301,8 +1392,11 @@ case $REQUEST in
else
autodistjobs="$AUTODISTJOB"
fi
- $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -b $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH $AUTODISTADD"
- RET=$?
+ $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -b $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH $AUTODISTADD" &>/dev/null
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo "Autodist build start. You may see the output in the
Webbuild jobs box above."
+ }
#[ $RET -eq 0 ] && social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"successfully built
$PACKAGE\" STIME=`date +%s`"
;;
"autodistinstall") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=
@@ -1314,8 +1408,12 @@ case $REQUEST in
else
autodistjobs="$AUTODISTJOB"
fi
- $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -i $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH $AUTODISTADD"
- RET=$? ;;
+ $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autodist -v -i $autodistjobs --repository ${AUTOPORT_BASE_REPOSITORY[$ENVIRONMENT]} --arch $AUTODISTARCH $AUTODISTADD" &>/dev/null
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo "Autodist install start. You may see the output in the
Webbuild jobs box above."
+ }
+ ;;
"autodistsend") [ "$AUTODISTFORCE" = "true" ] && AUTODISTADD="--force" || AUTODISTADD=
autodistjobs=
if [ "$AUTODISTPKGS" ]; then
@@ -1329,59 +1427,100 @@ case $REQUEST in
RET=$?
[ $RET -eq 0 ] && social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent
$AUTODISTPKGS to
$SENDREPOSITORY\" STIME=`date +%s`"
;;
- "autoport") $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autoport $PACKAGE -r $REPOSITORY -v"
- RET=$?
+ "autoport") $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autoport $PACKAGE -r $REPOSITORY" &>/dev/null
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo "Autoport started. You may see the output in the
Webbuild jobs box above."
+ }
;;
- "buildrootfiles") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd @RPMBUILDROOT@ && find @BUILDROOT@"; RET=$? ;;
- "autospecupdatescheck") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a2"; RET=$? ;;
+ "autospecupdatescheck") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a2"; RET=$? ;;
"rpmprepare") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bp $PACKAGE.spec --nodeps"; RET=$? ;;
"rpmbuild") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--force-build"
[ "$RPMBUILDARCH" -a "$RPMBUILDARCH" != "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] && \
RPMARCHADD="-A $RPMBUILDARCH --define \"cross_target_cpu=$RPMBUILDARCH\""
- $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a5,6 $RPMFORCEADD $RPMARCHADD"
+ $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a5,6 $RPMFORCEADD $RPMARCHADD" &>/dev/null
# && echo \"Webbuild HINT: now you may want to click on 'build requirements', add build requirements in .spec file and then 'recreate SRPMS'\""
- RET=$?
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo -n "Build started. You may see the output in the
Webbuild jobs box above."
+ echo -n "
HINT: when build is done add or update build requirements to specfile and recreate SRPM."
+ }
;;
- "srpmbuild") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir @WORKINGHOME@/RPM/SOURCES\" $PACKAGE.spec"
- RET=$? ;;
+ "srpmbuild") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--nodeps"
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $RPMFORCEADD $PACKAGE.spec"
+ RET=$? ;;
"autospeclistcheck")
[ "$RPMBUILDARCH" -a "$RPMBUILDARCH" != "${AUTOPORT_ARCH[$ENVIRONMENT]}" ] && \
RPMARCHADD="-A $RPMBUILDARCH --define \"cross_target_cpu=$RPMBUILDARCH\""
- $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a5 --list-check $RPMARCHADD"
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a5 --list-check --force $RPMARCHADD"
RET=$? ;;
- "autospecbuildreq") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a6"
+ "autospecbuildreq") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a6"
RET=$? ;;
- "rpmchecks") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a8"; RET=$? ;;
- "rpmsimulateinstall") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a7"; RET=$? ;;
+ "rpmchecks") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a8"; RET=$? ;;
+ "rpmsimulateinstall") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a7"; RET=$? ;;
"rpminstall") if [ "$USER_CANINSTALL" ]; then
[ "$RPMFORCE" = "true" ] && RPMFORCEADD="--force-install"
- $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a11 $RPMFORCEADD"; RET=$?
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a11 $RPMFORCEADD"; RET=$?
else
echo "Install function disabled."
RET=1
fi ;;
- "sendpackage") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "autospec -u $PACKAGE -a10 --server $SENDREPOSITORY"
- RET=$?
+ "sendpackage") if [ "$SENDREPOSITORY" ]; then
+ if [ "$SENDRECREATESRPM" ]; then
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY"
+ RET=$?
+ else
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY"
+ RET=$?
+ fi
if [ $RET -eq 0 ]; then
social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent
$PACKAGE to
$SENDREPOSITORY\" STIME=`date +%s`"
- fi ;;
- "sendsource") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--force --nodeps"
- if [ "$SENDREPOSITORY" ]; then
- $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir @WORKINGHOME@/RPM/SOURCES\" $PACKAGE.spec $RPMFORCEADD && autospec -u $PACKAGE -a10 --server $SENDREPOSITORY --norpm"
+ fi
+ else
+ echo "ERROR: send repository is not defined."
+ RET=255
+ fi
+ ;;
+ "sendsource") [ "$RPMFORCE" = "true" ] && RPMFORCEADD="--nodeps"
+ if [ "$SENDREPOSITORY" ]; then
+ if [ "$SENDRECREATESRPM" ]; then
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs --define=\"_sourcedir $SPECVAR_WORKINGHOME/RPM/SOURCES\" $PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --norpm"
RET=$?
+ if [ $RET -eq 0 ]; then
+ social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent edited
$PACKAGE source to
$SENDREPOSITORY\" STIME=`date +%s`"
+ fi
else
- echo "ERROR: send repository is not defined."
- RET=255
- fi ;;
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --norpm"
+ RET=$?
+ if [ $RET -eq 0 ]; then
+ social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"sent
$PACKAGE source to
$SENDREPOSITORY\" STIME=`date +%s`"
+ fi
+ fi
+ else
+ echo "ERROR: send repository is not defined."
+ RET=255
+ fi
+ ;;
"addpatch") if [ "$ADDPATCHURL" -a "$ADDPATCHNAME" ]; then
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "curl -skL \"$ADDPATCHURL\" -o ../SOURCES/$PACKAGE-$ADDPATCHNAME.patch"
RET=$?
- [ $RET -eq 0 ] && echo "Patch added with name $PACKAGE-$ADDPATCHNAME.patch"
+ [ $RET -eq 0 ] && {
+ echo -n "Patch added with name
$PACKAGE-$ADDPATCHNAME.patch."
+ echo -n "
HINT: add the following lines to the .spec file in the appropriate sections (fix indexes if needed):"
+ NEWPATCHNUM=`expr ${#SPECVAR_Patch[*]} + 1`
+ echo -ne "
Patch$NEWPATCHNUM: $PACKAGE-$ADDPATCHNAME.patch\n\n%patch$NEWPATCHNUM -p1
"
+ RET=-1
+ }
else
echo "Patch URL or destination name not provided."
RET=1
fi ;;
"repositoryimport")
+ [ "$PACKAGES" ] || {
+ echo "ERROR: no packages(s) selected."
+ RET=1
+ break
+ }
for p in $PACKAGES; do
[ "$REPOSITORYSIMULATE" = "true" -o ! "$USER_CANMAINTAIN" ] && SIMULATEADD="-s" || SIMULATEADD=
[ "$REPOSITORYFORCE" = "true" ] && FORCEADD="-f"
@@ -1394,6 +1533,11 @@ case $REQUEST in
done
;;
"repositoryrelease")
+ [ "$PACKAGES" ] || {
+ echo "ERROR: no package(s) selected."
+ RET=1
+ break
+ }
for p in $PACKAGES; do
[ "$REPOSITORYSIMULATE" = "true" -o ! "$USER_CANMAINTAIN" ] && SIMULATEADD="-s" || SIMULATEADD=
[ "$REPOSITORYFORCE" = "true" ] && SIMULATEADD="$SIMULATEADD -f"
@@ -1406,6 +1550,11 @@ case $REQUEST in
done
;;
"repositorydiff")
+ [ "$PACKAGES" ] || {
+ echo "ERROR: no package(s) selected."
+ RET=1
+ break
+ }
for p in $PACKAGES; do
$SUDO_WRAPPER 0 local "$USER" "" "openmamba-repository diff $SENDREPOSITORY $p -d $REPOSITORYIMPORTTO"
RET=$?
@@ -1413,6 +1562,11 @@ case $REQUEST in
done
;;
"repositoryarchive")
+ [ "$PACKAGES" ] || {
+ echo "ERROR: no package(s) selected."
+ RET=1
+ break
+ }
for p in $PACKAGES; do
[ "$REPOSITORYSIMULATE" = "true" -o ! "$USER_CANMAINTAIN" ] && SIMULATEADD="-s" || SIMULATEADD=
$SUDO_WRAPPER 0 local "$USER" "$PACKAGE" "openmamba-repository archive $SENDREPOSITORY $p -y"
@@ -1423,25 +1577,67 @@ case $REQUEST in
[ $RET -eq 0 ] || break
done
;;
+ "repositorymassrebuild")
+ if [ ! "$PACKAGES" ]; then
+ echo "ERROR: no package(s) selected."
+ RET=1
+ elif [ ! "$MASSREBUILDCHANGELOG" ]; then
+ echo "ERROR: changelog was not specified."
+ RET=1
+ else
+ $SUDO_WRAPPER background $ENVIRONMENT "$USER" "$PACKAGE" "autoport -r $SENDREPOSITORY -d $REPOSITORYIMPORTTO $PACKAGES -u \"$MASSREBUILDCHANGELOG\"" &>/dev/null
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo -n "Mass rebuild started. You may see the output in the
Webbuild jobs box above."
+ }
+# if [ $RET -eq 0 ]; then
+# social_log "SUSER=$USER SEMAIL=$USER_EMAIL STEXT=\"mass rebuilt
$PACKAGES from
$SENDREPOSITORY and sent them to
$REPOSITORYIMPORTTO\" STIME=`date +%s`"
+# fi
+ fi
+ ;;
"repositorysync")
if [ "$REPOSITORY" ]; then
$SUDO_WRAPPER background local "$USER" "" "/etc/cron.hourly/20-openmamba-apt $REPOSITORY"
- RET=$?
- [ $RET -eq 0 ] && $SUDO_WRAPPER background local "$USER" "" "/etc/cron.hourly/40-openmamba-rsync $REPOSITORY"
- RET=$?
- [ $RET -eq 0 ] || break
+ LOCALRET=$?
+ [ $LOCALRET -eq 0 ] && $SUDO_WRAPPER background local "$USER" "" "/etc/cron.hourly/40-openmamba-rsync $REPOSITORY"
+ LOCALRET=$?
+ [ $LOCALRET -ne 0 ] && RET=$LOCALRET || RET=-1
fi
;;
- "autoportnp") $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autoport -v -np $PACKAGE"; RET=$? ;;
+ "autoportnp") $SUDO_WRAPPER background $ENVIRONMENT "$USER" $PACKAGE "autoport -np $PACKAGE -r $PORTREPOSITORY" &>/dev/null
+ [ $? -ne 0 ] && RET=$? || {
+ RET=-1
+ echo -n "Autoport started. You may see the output in the
Webbuild jobs box above."
+ }
+ ;;
"autoportlog") cat "$AUTOPORTLOGDIR/current.log"; RET=$? ;;
- "allowedgroups") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autospec --eval rpm_allowed_groups"; RET=$? ;;
- "approvedlicenses") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "autospec --eval rpm_approved_licenses | grep -v \"^#\"" | \
+ "allowedgroups") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "$AUTOSPEC_CMD --eval rpm_allowed_groups"
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1
+ ;;
+ "approvedlicenses") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "$AUTOSPEC_CMD --eval rpm_approved_licenses | grep -v \"^#\"" | \
while read line; do
echo $line
done
- RET=0
+ RET=-1
;;
- "builddirfiles") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd @RPMBUILDDIR@ && find @BUILDDIR@"; RET=$? ;;
+ "builddirfiles") if [ ! "$SPECVAR_BUILDDIR" ]; then
+ echo "ERROR: BUILDDIR is undefined"
+ RET=1
+ else
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR && find $SPECVAR_BUILDDIR"
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1
+ fi
+ ;;
+ "buildrootfiles") if [ ! "$SPECVAR_BUILDROOT" ]; then
+ echo "ERROR: BUILDROOT is undefined"
+ RET=1
+ else
+ $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDROOT && find $SPECVAR_BUILDROOT"
+ RET=$?
+ fi
+ ;;
"showchangelogs"|"showbuilddocs"|"showlicenses")
if [ "$REQUEST" = "showchangelogs" ]; then
PATTERN="-iname changelog -or -iname news -and -type f"
@@ -1450,24 +1646,49 @@ case $REQUEST in
elif [ "$REQUEST" = "showbuilddocs" ]; then
PATTERN="-iname readme\* -or -iname install\* -or -iname todo\* -or -iname pkgbuild\* -and -type f"
fi
- files=`$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd @RPMBUILDDIR@/@BUILDDIR@ && find . $PATTERN -maxdepth 2"`
+ files=`$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && find . $PATTERN -maxdepth 2"`
cnt=0
for f in $files; do
echo -n "
$f"
done
echo -n "
"
for f in $files; do
- echo -n "
File $f:
"
+ echo -n "File $f:
"
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE \
- "cd @RPMBUILDDIR@/@BUILDDIR@ && head -c 10240 $f | sed \"s|<|\<|g;s|[[:cntrl:]]\[[0-9;]*m||g\"" | \
- tee /tmp/prova5
+ "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && head -c 10240 $f | sed \"s|<|\<|g;s|[[:cntrl:]]\[[0-9;]*m||g\"" | parse_generic_output
RET=$?
+ [ $RET -eq 0 ] && RET=-1
echo -n "
"
done
;;
- "configurehelp") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd @RPMBUILDDIR@/@BUILDDIR@ && ./configure --help"; RET=$? ;;
- "configurelog") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd @RPMBUILDDIR@/@BUILDDIR@ && cat config.log"; RET=$? ;;
- "showmacrosfile") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat /etc/rpm/macros.$MACROSFILE"; RET=$? ;;
+ "configurehelp") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && ./configure --help"
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1 ;;
+ "configurelog") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cd $SPECVAR_RPMBUILDDIR/$SPECVAR_BUILDDIR && cat config.log"
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1 ;;
+ "showmacrosfile") $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat /etc/rpm/macros.$MACROSFILE"
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1 ;;
+ "showpatchfile") OUTPATCHFILE=${PATCHFILE/*\/}
+ case ${OUTPATCHFILE/*.} in
+ gz|gzip) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "gunzip -c $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+ bz2) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "bzcat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+ *) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat $SPECVAR_RPMSOURCESDIR/$OUTPATCHFILE" | parse_patch_output ;;
+ esac
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1
+ ;;
+ "showsourcefile") OUTSOURCEFILE=${SOURCEFILE/*\/}
+ case ${OUTSOURCEFILE} in
+ *.tar.*) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "tar tvf $SPECVAR_RPMSOURCESDIR/$OUTSOURCEFILE" ;;
+ *.gz|*.gzip) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "gunzip -c $SPECVAR_RPMSOURCESDIR/$OUTSOURCEFILE" ;;
+ *.bz2) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "bzcat $SPECVAR_RPMSOURCESDIR/$OUTSOURCEFILE" ;;
+ *) $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat $SPECVAR_RPMSOURCESDIR/$OUTSOURCEFILE" | parse_patch_output ;;
+ esac
+ RET=$?
+ [ $RET -eq 0 ] && RET=-1
+ ;;
*) RET=0 ;;
esac
@@ -1477,16 +1698,23 @@ if [ "$REQUEST" != "" ]; then
fi
if [ $RET -eq 0 ]; then
echo "Result: OK"
- else
+ elif [ $RET -gt 0 ]; then
echo "Result: ERROR ($RET)"
fi
echo -n "
"
echo -n "]]>