bug fix for pbuilder-dist

This commit is contained in:
Stephan Hermann 2008-01-23 20:23:14 +01:00
parent 9c6e9d7ef5
commit cc7c0f544c
2 changed files with 16 additions and 6 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ubuntu-dev-tools (0.26) UNRELEASED; urgency=low
* pbuild-dist: fixed a bug with the *sudo call.
changed from $SUDOREPLACE "pbuilder" to $SUDOREPLACE -- pbuilder ...
-- Stephan Hermann <sh@sourcecode.de> Wed, 23 Jan 2008 20:21:42 +0100
ubuntu-dev-tools (0.25) hardy; urgency=low ubuntu-dev-tools (0.25) hardy; urgency=low
[ Michael Bienia ] [ Michael Bienia ]

View File

@ -31,6 +31,8 @@ then
SYSCACHE=1 SYSCACHE=1
fi fi
CALLDIR=`pwd`
################################ ################################
@ -248,21 +250,22 @@ then
;; ;;
esac esac
else else
SUDOREPLACE="sudo" SUDOREPLACE=sudo
fi fi
else else
SUDOREPLACE=$PBUILDAUTH SUDOREPLACE=$PBUILDAUTH
fi fi
echo $@
$SUDOREPLACE "pbuilder $OPERATION \ $SUDOREPLACE -- pbuilder $OPERATION \
--basetgz $BASE_DIR/$FOLDERBASE-base.tgz \ --basetgz $BASE_DIR/$FOLDERBASE-base.tgz \
--distribution $DISTRIBUTION \ --distribution $DISTRIBUTION \
--debootstrapopts --arch --debootstrapopts $BINARCH \ --debootstrapopts --arch \
--debootstrapopts $BINARCH \
$( [ $SAVELOG = 0 ] || echo "--logfile $BASE_DIR/.lastlog" ) \ $( [ $SAVELOG = 0 ] || echo "--logfile $BASE_DIR/.lastlog" ) \
$( [ -z $PROXY ] || echo "--http-proxy $PROXY" ) \ $( [ -z $PROXY ] || echo "--http-proxy $PROXY" ) \
$( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \ $( [ -z $DEBCACHE ] || echo "--aptcache $DEBCACHE" ) \
--buildresult $BASE_DIR/$FOLDERBASE_result \ --buildresult $BASE_DIR/$FOLDERBASE_result \
--mirror "$ARCHIVE" \ --mirror $ARCHIVE \
--aptconfdir $BASE_DIR/etc/$DISTRIBUTION/apt.conf/ \ --aptconfdir $BASE_DIR/etc/$DISTRIBUTION/apt.conf/ $@
$@"