From bbcc9460b4ff27bcf40dc52b281a86c9b39b79b3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 8 Jul 2014 18:55:58 +0200
Subject: [PATCH] webbuild-cgi: need to pass binary to some SUDO_WRAPPER calls
 after previous change

---
 webbuild/webbuild-cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi
index 4437c4b..6e6f369 100755
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@@ -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 "<pre><!-- SCROLL -->"
    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>"
    if [ "${WHAT_PROVIDES:0:10}" != "no package" ]; then
       for f in $WHAT_PROVIDES; do
@@ -542,7 +542,7 @@ if [ "$REQUEST" = "rpmmanager" ]; then
    rpmmanagerfiles=$rpmmanagerdir/$rpmmanagermask
    if [ "${rpmmanagermode}" = "environment" ]; then
       # 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
          pkgname=`basename $f`
          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 "PACKAGE=\"+encodeURIComponent(this.value)+\"&REQUEST=changespec\");>"
    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}
       [ "$PACKAGE" = "$specname" ] && SELECTED="selected=\"selected\"" || SELECTED=
       echo -n "<option value=\"$specname\" $SELECTED>${specname}</option>"
@@ -1187,7 +1187,7 @@ if [ "$REQUEST" = "edit" -o "$REQUEST" = "reloadspec" -o "$REQUEST" = "switchmai
          echo -n "</div>"
       fi
       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>"
 #   else
 #      echo "<output><![CDATA[<div align=left class=output id=outputtop>"