[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#861076: marked as done (unblock: pbuilder/0.226.7)

Your message dated Wed, 26 Apr 2017 21:30:26 +0000
with message-id <E1d3UW2-0003wK-5z@respighi.debian.org>
and subject line unblock pbuilder
has caused the Debian Bug report #861076,
regarding unblock: pbuilder/0.226.7
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
861076: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861076
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertag: unblock

Please unblock this (hopefully last) upload of pbuilder.

diffstat for pbuilder-0.228.6 pbuilder-0.228.7

 debian/changelog |   14 ++++++++++++++
 debian/control   |    1 -
 debian/copyright |    2 +-
 pbuilder-modules |   10 +++++++---
 4 files changed, 22 insertions(+), 5 deletions(-)

diff -Nru pbuilder-0.228.6/debian/changelog pbuilder-0.228.7/debian/changelog
--- pbuilder-0.228.6/debian/changelog	2017-03-12 16:23:59.000000000 +0100
+++ pbuilder-0.228.7/debian/changelog	2017-04-23 19:00:19.000000000 +0200
@@ -1,3 +1,17 @@
+pbuilder (0.228.7) unstable; urgency=medium
+
+  * modules: do not output debug for log().
+  * modules: use `mount|grep` instead of `mountpoint` to detect whether
+    /dev/ptmx and /dev/console are still mounted.
+    mountpoint(1) from initscripts as found in Debian jessie doesn't detect
+    mounts over regular files as the version in util-linux (present in
+    Debian stretch); this means those two checks could fail when run with
+    initscripts' mountpoint(1).
+    Closes: #859766
+  * Remove now not needed dependency on util-linux|initscripts.
+
+ -- Mattia Rizzolo <mattia@debian.org>  Sun, 23 Apr 2017 19:00:19 +0200
+
 pbuilder (0.228.6) unstable; urgency=medium
 
   [ James Clarke ]
diff -Nru pbuilder-0.228.6/debian/control pbuilder-0.228.7/debian/control
--- pbuilder-0.228.6/debian/control	2017-03-12 16:23:59.000000000 +0100
+++ pbuilder-0.228.7/debian/control	2017-04-23 18:59:37.000000000 +0200
@@ -25,7 +25,6 @@
 Depends:
  debootstrap | cdebootstrap,
  dpkg-dev (>= 1.17.0),
- util-linux (>= 2.26.2-4) | initscripts (<< 2.88dsf-59.1),
  wget,
  ${misc:Depends},
 Recommends:
diff -Nru pbuilder-0.228.6/debian/copyright pbuilder-0.228.7/debian/copyright
--- pbuilder-0.228.6/debian/copyright	2016-12-26 15:49:57.000000000 +0100
+++ pbuilder-0.228.7/debian/copyright	2017-04-23 18:52:17.000000000 +0200
@@ -5,7 +5,7 @@
 Files: *
 Copyright: 2001-2009 Junichi Uekawa <dancer@debian.org>
            2007-2010 Loïc Minier <lool@dooz.org>
-           2015-2016 Mattia Rizzolo <mattia@debian.org>
+           2015-2017 Mattia Rizzolo <mattia@debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff -Nru pbuilder-0.228.6/pbuilder-modules pbuilder-0.228.7/pbuilder-modules
--- pbuilder-0.228.6/pbuilder-modules	2017-03-12 16:23:59.000000000 +0100
+++ pbuilder-0.228.7/pbuilder-modules	2017-04-23 18:52:17.000000000 +0200
@@ -1,7 +1,7 @@
 #! /bin/bash
 #   pbuilder -- personal Debian package builder
 #   Copyright © 2001-2009 Junichi Uekawa <dancer@debian.org>
-#               2015-2016 Mattia Rizzolo <mattia@debian.org>
+#               2015-2017 Mattia Rizzolo <mattia@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -119,6 +119,7 @@
     set +u
 }
 function log() {
+    set +x
     case "$*" in
         "E: "*)
             _log 'red' "$*" >&2
@@ -137,6 +138,9 @@
             exit 1
             ;;
     esac
+    if [ "$PBUILDER_DEBUGMODE" = "yes" ]; then
+        set -x
+    fi
 }
 
 log.e() {
@@ -276,10 +280,10 @@
         umount_one "$SELINUX"
     fi
     if [ "$DEB_BUILD_ARCH_OS" = "linux" ] && [ "$USEDEVPTS" = "yes" ]; then
-        if mountpoint -q "$BUILDPLACE/dev/console"; then
+        if mount | grep -q -F " $(readlink -f "$BUILDPLACE")/dev/console"; then
             umount_one "dev/console"
         fi
-        if mountpoint -q "$BUILDPLACE/dev/ptmx"; then
+        if mount | grep -q -F " $(readlink -f "$BUILDPLACE")/dev/ptmx"; then
             umount_one "dev/ptmx"
         fi
         umount_one "dev/pts"


-- 
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  `-

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Unblocked pbuilder.

--- End Message ---
Reply to: