Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-11 00:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with trunk

Browse Source
This commit is contained in:
Siegfried-Angel Gevatter Pujals (RainCT) 2008-01-24 19:54:39 +01:00
commit a5b6bcf552
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/changelog vendored
View File

@ -1,4 +1,11 @@
ubuntu-dev-tools (0.25) UNRELEASED; urgency=low 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
[ Michael Bienia ] [ Michael Bienia ]
* requestsync: * requestsync:
@ -34,7 +41,7 @@ ubuntu-dev-tools (0.25) UNRELEASED; urgency=low
* mk-sbuild-lv: check for debootstrap release names in * mk-sbuild-lv: check for debootstrap release names in
/usr/share/debootstreap/releases and not in /usr/lib/debootstrap/releases /usr/share/debootstreap/releases and not in /usr/lib/debootstrap/releases
* pbuilder-dist: * pbuilder-dist:
- check if $SYSCACHE is not set and stay with the default, if - check if $SYSCACHE is not set and stay with the default, if
SYSCACHE = 0 use the default from pbuilderrc or honor $DEBCACHE SYSCACHE = 0 use the default from pbuilderrc or honor $DEBCACHE
(LP: #156183) (LP: #156183)
- removed $BINARCH check in pbuilder call, and set --debootstrapopts - removed $BINARCH check in pbuilder call, and set --debootstrapopts
@ -64,7 +71,7 @@ ubuntu-dev-tools (0.25) UNRELEASED; urgency=low
* dch-repeat: add Hardy to distro list. * dch-repeat: add Hardy to distro list.
* mk-sbuild-lv: use -r instead of -f for possible debootstrap symlinks. * mk-sbuild-lv: use -r instead of -f for possible debootstrap symlinks.
-- Kees Cook <kees@ubuntu.com> Mon, 21 Jan 2008 09:20:05 -0800 -- Stephan Hermann <sh@sourcecode.de> Tue, 22 Jan 2008 19:28:34 +0100
ubuntu-dev-tools (0.24) hardy; urgency=low ubuntu-dev-tools (0.24) hardy; urgency=low

15
pbuilder-dist
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/ $@
$@"