Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in pbuilder-dist (seems it works now, but needs testing)

Browse Source
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-02-17 19:27:32 +01:00
parent abaa5f068a
commit 498b7d681d
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -29,6 +29,7 @@ ubuntu-dev-tools (0.26) UNRELEASED; urgency=low
the default section to universe. the default section to universe.
* Add AUTHORS section to doc/check-symbols.1, and little changes to * Add AUTHORS section to doc/check-symbols.1, and little changes to
doc/suspicious-source.1. doc/suspicious-source.1.
* Fix some issues with the new pbuilder-dist code.
-- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 17 Feb 2008 17:36:11 +0100 -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com> Sun, 17 Feb 2008 17:36:11 +0100

37
pbuilder-dist
View File

@ -186,21 +186,6 @@ then
DEBCACHE='/var/cache/apt/archives/' DEBCACHE='/var/cache/apt/archives/'
fi fi
# Check what version of pbuilder is installed, and if
# it's supported, use the --components option
if dpkg --compare-versions $(dpkg-query -W -f='${Version}' pbuilder) ge 0.174
then
COMPONENTS_LINE="--othermirror \"\" --components \"$COMPONENTS\""
else
# else, do it the old way
if [ $ISDEBIAN = True ]; then
echo "Warning: If this operation fails it might be because you changed the value of $COMPONENTS in the pbuilderrc file."
echo "See https://bugs.launchpad.net/ubuntu/+source/ubuntu-dev-tools/+bug/140964 for more information."
fi
COMPONENTS_LINE="--othermirror \"deb $ARCHIVE $DISTRIBUTION $COMPONENTS\""
fi
if [ -n $http_proxy ] || [ -n $HTTP_PROXY ] if [ -n $http_proxy ] || [ -n $HTTP_PROXY ]
then then
if [ -n $http_proxy ] if [ -n $http_proxy ]
@ -211,7 +196,6 @@ then
fi fi
fi fi
if [ $ISDEBIAN = "False" ] if [ $ISDEBIAN = "False" ]
then then
if [ ! -d $BASE_DIR/etc/$DISTRIBUTION/apt.conf/ ] if [ ! -d $BASE_DIR/etc/$DISTRIBUTION/apt.conf/ ]
@ -234,9 +218,9 @@ EOF
fi fi
fi fi
if [ -z $PBUILDAUTH ] if [ -z "$PBUILDAUTH" ]
then then
if [ -n $DESKTOP_SESSION ] if [ -n "$DESKTOP_SESSION" ]
then then
case $DESKTOP_SESSION in case $DESKTOP_SESSION in
gnome ) gnome )
@ -256,16 +240,15 @@ else
SUDOREPLACE=$PBUILDAUTH SUDOREPLACE=$PBUILDAUTH
fi fi
echo $@ sudo pbuilder $OPERATION \
--basetgz "$BASE_DIR/$FOLDERBASE-base.tgz" \
$SUDOREPLACE -- pbuilder $OPERATION \ --distribution "$DISTRIBUTION" \
--basetgz $BASE_DIR/$FOLDERBASE-base.tgz \
--distribution $DISTRIBUTION \
--debootstrapopts --arch \ --debootstrapopts --arch \
--debootstrapopts $BINARCH \ --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/" \
$@