Bug#493538: Please add --build-twice-in-a-row option

2008-08-06 Thread Nicolas Valcárcel
Yes i did, and it works, also it's already included in ubuntu. Then
patch is this one:
http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;filename=twice-in-a-row.patch;att=1;bug=493538

On Wed, 2008-08-06 at 11:53 +0900, Junichi Uekawa wrote:
 I reviewed your second patch and it doesn't make sense, did you actually test 
 it?
 
 At Mon, 04 Aug 2008 23:05:38 -0400,
 Nicolas Valcárcel wrote:
  
  [1  text/plain (quoted-printable)]
  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.0 -0400
+++ pbuilder-0.181/pbuilder 2008-08-03 21:27:29.0 -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.0 -0400
+++ pbuilder-0.181/pbuilder.8   2008-08-03 21:30:13.0 -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-buildpackage2008-05-24 
18:54:05.0 -0400
+++ pbuilder-0.181/pbuilder-buildpackage2008-08-02 
19:13:07.0 -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.0 
-0400
+++ pbuilder-0.181/pbuilder-modules 2008-08-03 21:30:54.0 
-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
  
  [2 This is a digitally signed message part application/pgp-signature 
  (7bit)]
  
-- 
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


Bug#493538: Please add --build-twice-in-a-row option

2008-08-06 Thread Junichi Uekawa

I reviewed your second patch and it doesn't make sense, did you actually test 
it?

At Mon, 04 Aug 2008 23:05:38 -0400,
Nicolas Valcárcel wrote:
 
 [1  text/plain (quoted-printable)]
 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.0 -0400
   +++ pbuilder-0.181/pbuilder   2008-08-03 21:27:29.0 -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.0 -0400
   +++ pbuilder-0.181/pbuilder.8 2008-08-03 21:30:13.0 -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.0 
   -0400
   +++ pbuilder-0.181/pbuilder-buildpackage  2008-08-02 19:13:07.0 
   -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.0 
   -0400
   +++ pbuilder-0.181/pbuilder-modules   2008-08-03 21:30:54.0 
   -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
 
 [2 This is a digitally signed message part application/pgp-signature (7bit)]
 



--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#493538: Please add --build-twice-in-a-row option

2008-08-05 Thread Nicolas Valcárcel
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.0 -0400
  +++ pbuilder-0.181/pbuilder 2008-08-03 21:27:29.0 -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.0 -0400
  +++ pbuilder-0.181/pbuilder.8   2008-08-03 21:30:13.0 -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-buildpackage2008-05-24 18:54:05.0 
  -0400
  +++ pbuilder-0.181/pbuilder-buildpackage2008-08-02 19:13:07.0 
  -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.0 -0400
  +++ pbuilder-0.181/pbuilder-modules 2008-08-03 21:30:54.0 -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


Bug#493538: Please add --build-twice-in-a-row option

2008-08-02 Thread Nicolas Valcárcel
Package: pbuilder
Version: 0.181
Severity: wishlist
Tags: patch

--- Please enter the report below this line. ---

Many sponsors will build packages twice in a row to ensure the archive
will be reuildable. Adding a pbuilder option to do this would make it
easier for people to test for this and improve the quality of the
archive.

This option would restart the build in the same chroot with the
post-build source from the first build.

--- System information. ---
Architecture: i386
Kernel:   Linux 2.6.24-19-generic

Debian Release: lenny/sid
  500 hardy-updates   archive.ubuntu.com 
  500 hardy-security  security.ubuntu.com 
  500 hardy-backports us.archive.ubuntu.com 
  500 hardy-backports archive.ubuntu.com 
  500 hardy   archive.ubuntu.com 

--- Package information. ---
Depends (Version) | Installed
=-+-=
coreutils(= 4.5.8-1) | 6.10-3ubuntu2
debianutils   (= 1.13.1) | 2.28.2-0ubuntu1
debootstrap   | 1.0.9~hardy1
 OR cdebootstrap  | 
gcc   | 4:4.2.3-1ubuntu6
wget  | 1.10.2-3ubuntu1

-- 
aka nxvl
Key fingerprint = BCE4 27A0 D03E 55DE DA2D  BE06 891D 8DEE 6545 97FE
gpg --keyserver keyserver.ubuntu.com --recv-keys 654597FE

--- pbuilder	2008-05-24 18:54:05.0 -0400
+++ pbuilder	2008-08-02 19:13:18.0 -0400
@@ -34,6 +34,10 @@
 	shift ;
 	/usr/lib/pbuilder/pbuilder-updatebuildenv $@
 	;;
+--build-twice-in-a-row|build-twice-in-a-row)
+shift ;
+/usr/lib/pbuilder/pbuilder-buildpackage --twice $@
+;;
 --build|build)
 	shift ;
 	/usr/lib/pbuilder/pbuilder-buildpackage $@
--- pbuilder-buildpackage	2008-05-24 18:54:05.0 -0400
+++ pbuilder-buildpackage	2008-08-02 19:13:07.0 -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
 
 (


signature.asc
Description: This is a digitally signed message part