On my last patch it adds a --twice option which fixes the issue on the where it should be.
On Tue, 2008-08-05 at 11:33 +0900, Junichi Uekawa wrote: > Hi, > > I think the concept of the patch might be a good thing, but I don't > like the location the command-line option was added. It should really > be added in pbuilder-checkparams. > > BTW, can't you actually create a hook script of some sort? That'd be > a much easier change to incorporate. > > > > > --- pbuilder-0.181/pbuilder 2008-05-24 18:54:05.000000000 -0400 > > +++ pbuilder-0.181/pbuilder 2008-08-03 21:27:29.000000000 -0400 > > @@ -34,6 +34,10 @@ > > shift ; > > /usr/lib/pbuilder/pbuilder-updatebuildenv "$@" > > ;; > > + --build-twice|build-twice) > > + shift ; > > + /usr/lib/pbuilder/pbuilder-buildpackage --twice "$@" > > + ;; > > --build|build) > > shift ; > > /usr/lib/pbuilder/pbuilder-buildpackage "$@" > > --- pbuilder-0.181/pbuilder.8 2008-05-24 18:54:05.000000000 -0400 > > +++ pbuilder-0.181/pbuilder.8 2008-08-03 21:30:13.000000000 -0400 > > @@ -8,6 +8,8 @@ > > .PP > > .BI "pbuilder --build [" "options" "] " ".dsc-file" > > .PP > > +.BI "pbuilder --build-twice [" "options" "] " ".dsc-file" > > +.PP > > .BI "pbuilder --execute [" "options" "] -- " "script [" "script options" > > "]" > > .PP > > .BI "pbuilder --clean" > > @@ -51,6 +53,13 @@ > > .B "base.tgz" > > > > .TP > > +.B "--build-twice" > > +Builds the package specified by > > +.I ".dsc-file" > > +twice in a row in the chroot environment created using the > > +.B "base.tgz" > > + > > +.TP > > .B "--clean" > > Cleans up the directory specified by the configuration > > .B "BUILDPLACE" > > --- pbuilder-0.181/pbuilder-buildpackage 2008-05-24 18:54:05.000000000 > > -0400 > > +++ pbuilder-0.181/pbuilder-buildpackage 2008-08-02 19:13:07.000000000 > > -0400 > > @@ -25,6 +25,11 @@ > > . /usr/lib/pbuilder/pbuilder-runhooks > > . /usr/lib/pbuilder/pbuilder-buildpackage-funcs > > > > +if [ "$1" = --twice]; then > > + TWICE=True > > + shift; > > +fi > > + > > PACKAGENAME="$1" > > if [ ! -f "$PACKAGENAME" ]; then > > echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file > > name" >&2 > > @@ -117,8 +122,14 @@ > > > > if [ -z "$DEBEMAIL" ]; then > > DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc > > $DEBBUILDOPTS" > > + if [ -z "$TWICE" ]; then > > + DPKG_COMMANDLINE="$DPKG_COMMANDLINE; dpkg-buildpackage -us -uc > > $DEBBUILDOPTS" > > + fi > > else > > DPKG_COMMANDLINE="cd tmp/buildd/*/; dpkg-buildpackage -us -uc > > \"-m$DEBEMAIL\" $DEBBUILDOPTS" > > + if [ -z "$TWICE" ]; then > > + DPKG_COMMANDLINE="$DPKG_COMMANDLINE; dpkg-buildpackage -us -uc > > \"-m$DEBEMAIL\" $DEBBUILDOPTS" > > + fi > > fi > > > > ( > > --- pbuilder-0.181/pbuilder-modules 2008-05-24 18:54:05.000000000 -0400 > > +++ pbuilder-0.181/pbuilder-modules 2008-08-03 21:30:54.000000000 -0400 > > @@ -37,6 +37,9 @@ > > pbuilder --build [--basetgz base.tgz-path] pbuilder_2.2.0-1.dsc > > Builds using the base.tgz. Requires a .dsc filename > > > > +pbuilder --build-twice [--basetgz base.tgz-path] pbuilder_2.2.0-1.dsc > > + Builds twice in a row using the base.tgz. Requires a .dsc filename > > + > > pbuilder --clean > > Cleans the temporal build directory. > > -- aka nxvl Key fingerprint = BCE4 27A0 D03E 55DE DA2D BE06 891D 8DEE 6545 97FE gpg --keyserver keyserver.ubuntu.com --recv-keys 654597FE
signature.asc
Description: This is a digitally signed message part
