From 8aaf2393425ce1eb5cf288e0720bfafa5e932dab Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Sep 2014 22:36:46 +0200 Subject: [PATCH] webbuild-cgi: honour selected target arch when sending package --- webbuild/webbuild-cgi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index db6403a..6426a3f 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -1473,6 +1473,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=sendpackage&" echo -n "SENDRECREATESRPM=\"+getElementById('sendrecreatesrpm').checked+\"&" echo -n "SPECTEXT=\"+encodeURIComponent(editor.getValue())+\"&" + echo -n "AUTODISTARCH=\"+getSelectedValueById('rpmbuildarch')+\"&" echo -n "SENDREPOSITORY=\"+getSelectedValueById('sendrepository')" echo -n ",\"`cgi_encodevar "Send $PACKAGE built packages to "`\"+getSelectedValueById('sendrepository')+" echo -n "\"`cgi_encodevar "?

HINT: does summary look short and good?
${SPECVAR_Name[0]} - ${SPECVAR_Summary[0]}."`\"" @@ -1777,10 +1778,10 @@ $RPMFORCEADD $PACKAGE.spec" if [ "$SENDRECREATESRPM" = "true" ]; then $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "rpmbuild -bs \ --define=\"_topdir $SPECVAR_WORKINGHOME/RPM\" \ -$PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY" +$PACKAGE.spec $RPMFORCEADD && $AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --arch $AUTODISTARCH" RET=$? else - $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY" + $SUDO_WRAPPER 0 $ENVIRONMENT "$USER" $PACKAGE "$AUTOSPEC_CMD -u $PACKAGE -a10 --server $SENDREPOSITORY --arch $AUTODISTARCH" RET=$? fi if [ $RET -eq 0 ]; then