Merge lp:~smcv/pkg-create-dbgsym/debug into lp:ubuntu/trusty/pkg-create-dbgsym

[Simon McVittie]

Debug-logging improvements

[Martin Pitt (pitti)]

Thanks! I merged that with a few stylistic updates, like avoiding the "if [...]; then : else" syntax.

review: Approve

=== modified file 'dh_strip'
--- dh_strip	2011-05-19 19:09:20 +0000
+++ dh_strip	2014-02-11 16:08:54 +0000
@@ -53,8 +53,10 @@
 
 if [ "$PKG_IGNORE_CURRENTLY_BUILDING" = 1 ]; then
     addtofiles="-a"
+    dbg "enabling due to PKG_IGNORE_CURRENTLY_BUILDING = 1"
 elif grep -qs '^Build-Debug-Symbols: yes$' /CurrentlyBuilding; then
     addtofiles="-a"
+    dbg "enabling due to Build-Debug-Symbols: yes in /CurrentlyBuilding"
 else
     # If sbuild hasn't explicitly told us to build debug symbols, we will
     # avoid doing so if this is a rebuild or PPA build.
@@ -72,7 +74,12 @@
     # upload ddebs unless we really know that Soyuz can handle them, so
     # we tell pkg_create_dbgsym to avoid adding them to the changes
     # file.
-    [ -f /CurrentlyBuilding ] || addtofiles="-a"
+    if [ -f /CurrentlyBuilding ]; then
+        dbg "disabling because /CurrentlyBuilding doesn't enable it"
+    else
+        addtofiles="-a"
+        dbg "enabling because /CurrentlyBuilding doesn't exist"
+    fi
 fi
 
 if [ -n "$NO_PKG_MANGLE" ]; then

=== modified file 'pkg_create_dbgsym'
--- pkg_create_dbgsym	2013-09-02 08:34:39 +0000
+++ pkg_create_dbgsym	2014-02-11 16:08:54 +0000
@@ -35,6 +35,10 @@
 	OBJCOPY=${DEB_HOST_GNU_TYPE}-objcopy
 fi
 
+dbg() {
+    echo "$0: $*"
+}
+
 for p; do
     case $p in
         -X*)
@@ -71,10 +75,20 @@
 # python-*-dbg, these are quite different
 dbgdepends=
 for p in `grep '^Package:.*-dbg' debian/control | cut -f 2 -d\ `; do
-    [ "$p" = "${p#python}" ] || continue
+    if [ "$p" = "${p#python}" ]; then
+        :
+    else
+        dbg "ignoring python* package: $p"
+        continue
+    fi
     # heuristic to avoid considering transitional -dbg packages which are going
     # to be empty
-    [ -z "`perl -n000 -e 'print if m/Package: $p/ && m/transitional/' debian/control`" ] || continue
+    if [ -z "`perl -n000 -e 'print if m/Package: $p/ && m/transitional/' debian/control`" ]; then
+        :
+    else
+        dbg "ignoring transitional package $p"
+        continue
+    fi
     [ -z "$dbgdepends" ] || dbgdepends="$dbgdepends, "
     dbgdepends="$dbgdepends$p (= \1)"
 done
@@ -139,7 +153,7 @@
     }
 done
 if [ -z "$any_unstripped" ]; then
-    echo "$pkgname is already stripped, ignoring" >&2
+    echo "$pkgname has no unstripped objects, ignoring" >&2
     rm -rf $dp
     exit 0
 fi
@@ -147,6 +161,7 @@
 cd $origdir
 
 if [ ! -d "$dp" -o -z "`find $dp -type f`" ] && [ -z "$dbgdepends" ]; then
+    dbg "nothing in $dp and no dbgdepends, ignoring"
     rm -rf $dp
     exit 0
 fi
@@ -185,8 +200,10 @@
 ddeb="${ddebname}_${ddebversion}_${ddebarch}.ddeb"
 
 # build .ddeb and add it to debian/files
+dbg "building ddeb package"
 NO_PKG_MANGLE=1 dpkg-deb -Zxz --build $dp ../$ddeb
 if [ "$add_to_files" = "1" ]; then
+    dbg "dpkg-distaddfile $ddeb $ddebsection $ddebpriority"
     dpkg-distaddfile "$ddeb" "$ddebsection" "$ddebpriority"
 fi