Bug#926224: unblock pbuilder/0.230.4

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Bug#926224: unblock pbuilder/0.230.4

Mattia Rizzolo-5
Package: release.debian.org
User: [hidden email]
Usertags: unblock

Hi,

it seems we accidentally introduced a serious bug in the last upload.
Luckily the fix is trivial, but it was reported privately to me too late
to block the migration to testing.

anyway, here is the diff:


diffstat for pbuilder-0.230.3 pbuilder-0.230.4

 debian/changelog        |    8 ++++++++
 pbuilder-createbuildenv |   12 ++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff -Nru pbuilder-0.230.3/debian/changelog pbuilder-0.230.4/debian/changelog
--- pbuilder-0.230.3/debian/changelog 2019-03-26 15:44:52.000000000 +0100
+++ pbuilder-0.230.4/debian/changelog 2019-04-02 11:32:38.000000000 +0200
@@ -1,3 +1,11 @@
+pbuilder (0.230.4) unstable; urgency=medium
+
+  * createbuildenv:
+    + Only try to print debootstrap.log if the file really exists.
+    + Properly handle the case of a disabled internal cache.  Closes: #926115
+
+ -- Mattia Rizzolo <[hidden email]>  Tue, 02 Apr 2019 11:32:38 +0200
+
 pbuilder (0.230.3) unstable; urgency=medium

   [ Marcin Sulikowski ]
diff -Nru pbuilder-0.230.3/pbuilder-createbuildenv pbuilder-0.230.4/pbuilder-createbuildenv
--- pbuilder-0.230.3/pbuilder-createbuildenv 2019-03-15 15:33:18.000000000 +0100
+++ pbuilder-0.230.4/pbuilder-createbuildenv 2019-04-02 11:25:17.000000000 +0200
@@ -75,16 +75,20 @@
 if ! ( "${DEBOOTSTRAP}" \
     ${ARCHITECTURE:+--arch=$ARCHITECTURE} \
     --include=apt \
-    "$USE_CACHE" \
+    ${USE_CACHE:+"$USE_CACHE"} \
     "${DEBOOTSTRAPOPTS[@]}" \
     "$DISTRIBUTION" \
     "$BUILDPLACE" \
     "$MIRRORSITE" \
     $DEBOOTSTRAPSCRIPT ) ; then
     log.e "$DEBOOTSTRAP failed"
-    log.e "Tail of debootstrap.log:"
-    tail -n 50 "$BUILDPLACE/debootstrap/debootstrap.log"
-    log.e "End of debootstrap.log"
+    if [ -f "$BUILDPLACE/debootstrap/debootstrap.log" ]; then
+        log.e "Tail of debootstrap.log:"
+        tail -n 50 "$BUILDPLACE/debootstrap/debootstrap.log"
+        log.e "End of debootstrap.log"
+    else
+        log.e "debootstrap.log not present"
+    fi
     exit 1
 fi



--
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

signature.asc (849 bytes) Download Attachment