openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webbuild-cgi: need to pass binary to some SUDO_WRAPPER calls after previous change

Browse Source
This commit is contained in:
Silvan Calarco 2014-07-08 18:55:58 +02:00
parent 8e4e790104
commit bbcc9460b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webbuild/webbuild-cgi
View File

@ -484,7 +484,7 @@ if [ "$REQUEST" = "environmentsearch" ]; then
echo -n "<hr><b>Environment search results for \"$ENVSEARCHTEXT\":</b><div align=left class=output id=outputtop>" echo -n "<hr><b>Environment search results for \"$ENVSEARCHTEXT\":</b><div align=left class=output id=outputtop>"
echo -n "<pre><!-- SCROLL -->" echo -n "<pre><!-- SCROLL -->"
echo -n "<font style=\"background-color:gray\">Installed packages providing '$ENVSEARCHTEXT':</font><br>" echo -n "<font style=\"background-color:gray\">Installed packages providing '$ENVSEARCHTEXT':</font><br>"
WHAT_PROVIDES=`$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "rpm -q --what-provides \"$ENVSEARCHTEXT\"" | sort -u` WHAT_PROVIDES=`$SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "rpm -q --what-provides \"$ENVSEARCHTEXT\"" | sort -u`
echo -n "$WHAT_PROVIDES<br>" echo -n "$WHAT_PROVIDES<br>"
if [ "${WHAT_PROVIDES:0:10}" != "no package" ]; then if [ "${WHAT_PROVIDES:0:10}" != "no package" ]; then
for f in $WHAT_PROVIDES; do for f in $WHAT_PROVIDES; do
@ -542,7 +542,7 @@ if [ "$REQUEST" = "rpmmanager" ]; then
rpmmanagerfiles=$rpmmanagerdir/$rpmmanagermask rpmmanagerfiles=$rpmmanagerdir/$rpmmanagermask
if [ "${rpmmanagermode}" = "environment" ]; then if [ "${rpmmanagermode}" = "environment" ]; then
# local files in environment # local files in environment
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "ls -t $rpmmanagerfiles 2>/dev/null" | \ $SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "ls -t $rpmmanagerfiles 2>/dev/null" | \
while read f; do while read f; do
pkgname=`basename $f` pkgname=`basename $f`
echo -n "<label>" echo -n "<label>"
@ -732,7 +732,7 @@ elif [ ! "$REQUEST" -o "$REQUEST" = "changeenvironment" -o "$REQUEST" = "switchm
echo -n "onchange=ajax_getvalues(\"REQUEST=edit&ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&" echo -n "onchange=ajax_getvalues(\"REQUEST=edit&ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&"
echo -n "PACKAGE=\"+encodeURIComponent(this.value)+\"&REQUEST=changespec\");>" echo -n "PACKAGE=\"+encodeURIComponent(this.value)+\"&REQUEST=changespec\");>"
echo -n "<option value=\"\">-- Select a .spec file --</option>" echo -n "<option value=\"\">-- Select a .spec file --</option>"
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" "" "ls *.spec 2>/dev/null| sed \"s|.spec$||\" | sort -f" | while read f; do $SUDO_WRAPPER binary $ENVIRONMENT "$USER" "" "ls *.spec 2>/dev/null| sed \"s|.spec$||\" | sort -f" | while read f; do
specname=${f/.spec} specname=${f/.spec}
[ "$PACKAGE" = "$specname" ] && SELECTED="selected=\"selected\"" || SELECTED= [ "$PACKAGE" = "$specname" ] && SELECTED="selected=\"selected\"" || SELECTED=
echo -n "<option value=\"$specname\" $SELECTED>${specname}</option>" echo -n "<option value=\"$specname\" $SELECTED>${specname}</option>"
@ -1187,7 +1187,7 @@ if [ "$REQUEST" = "edit" -o "$REQUEST" = "reloadspec" -o "$REQUEST" = "switchmai
echo -n "</div>" echo -n "</div>"
fi fi
echo -n "Current <b>$PACKAGE.spec</b> in build environment:<textarea id=spectext class=editor>" echo -n "Current <b>$PACKAGE.spec</b> in build environment:<textarea id=spectext class=editor>"
$SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "cat $PACKAGE.spec" $SUDO_WRAPPER binary $ENVIRONMENT "$USER" $PACKAGE "cat $PACKAGE.spec"
echo -n "</textarea>]]></editor>" echo -n "</textarea>]]></editor>"
# else # else
# echo "<output><![CDATA[<div align=left class=output id=outputtop>" # echo "<output><![CDATA[<div align=left class=output id=outputtop>"