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

Bug#694559: unblock (RFS): apt-build/0.12.44



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
thanks


Hi,

please unblock (and sponsor) package apt-build 0.12.44.


This version contains two bug fixes:

Tl;dr: - Installation failure on all armel machines.
       - Unexpected behavior with custom APT Dir::... paths.

Since version 0.12.42 apt-build doesn't install if /dev/cpuinfo exists
but no "processor" string is available in this output (e.g. armel).
debian/config script greps for "processor" but do not catch error.
See #694554 (grave). [1]

This package version also fixes APT path buildings. If
Dir::Etc::sourcelist or Dir::Etc::sourceparts is an absolute path,
apt-build won't recognize it, it will append it to Dir and Dir::Etc.
See #694557. [2]


If this is needed for you, the package is on mentors:
  http://mentors.debian.net/package/apt-build

Download it with:
  dget -x
http://mentors.debian.net/debian/pool/main/a/apt-build/apt-build_0.12.44.dsc


Please see attached debdiff. Diffstat:
 changelog |   10 ++++++++++
 config    |    9 ++++-----
 postinst  |   11 ++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)


Regards
Dominique


[1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694554
[2]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694557

Attachment: 0xB2E4F4F3.asc
Description: application/pgp-keys

diffstat for apt-build-0.12.43 apt-build-0.12.44

 changelog |   10 ++++++++++
 config    |    9 ++++-----
 postinst  |   11 ++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff -Nru apt-build-0.12.43/debian/changelog apt-build-0.12.44/debian/changelog
--- apt-build-0.12.43/debian/changelog	2012-04-11 23:14:35.000000000 +0200
+++ apt-build-0.12.44/debian/changelog	2012-11-27 18:43:26.000000000 +0100
@@ -1,3 +1,13 @@
+apt-build (0.12.44) unstable; urgency=low
+
+  * QA upload.
+  * Don't fail on postinstallation if no "processor" found in /proc/cpuinfo.
+    LP: #1065678 (Thanks to Dawid Wróbel.) Closes: #694554
+  * Generate APT paths properly with apt-config shell .../f .../d .
+    Closes: #694557
+
+ -- Dominique Lasserre <lasserre.d@gmail.com>  Tue, 27 Nov 2012 18:43:18 +0100
+
 apt-build (0.12.43) unstable; urgency=low
 
   * QA upload.
diff -Nru apt-build-0.12.43/debian/config apt-build-0.12.44/debian/config
--- apt-build-0.12.43/debian/config	2012-04-11 23:11:12.000000000 +0200
+++ apt-build-0.12.44/debian/config	2012-10-15 23:46:03.000000000 +0200
@@ -76,9 +76,8 @@
 
 db_subst apt-build/add_to_sourceslist repo "$RET"
 
-eval $(apt-config shell etcdir Dir::Etc)
-eval $(apt-config shell sourceslist Dir::Etc::sourcelist)
-eval $(apt-config shell sourcesparts Dir::Etc::sourceparts)
+eval $(apt-config shell sourceslist Dir::Etc::sourcelist/f)
+eval $(apt-config shell sourcesparts Dir::Etc::sourceparts/d)
 
 if [ ! -e $CONFFILE ] ; then
   # set to true for initial configuration (conffile does not exist)
@@ -87,7 +86,7 @@
   db_set apt-build/add_to_sourceslist "false"
   
   # run loop to prevent errors if some sources does not exist
-  for source in /"$etcdir""$sourceslist" /"$etcdir""$sourcesparts"/*.list ; do
+  for source in "$sourceslist" "$sourcesparts"*.list ; do
     if [ -e "$source" ] ; then
       if grep -Eq "^[[:space:]]*deb file:$repository_dir apt-build main" "$source" ; then
         db_set apt-build/add_to_sourceslist "true"
@@ -109,7 +108,7 @@
   multithreaded="$make_options"
 elif [ -r /proc/cpuinfo ] && [ ! -e $CONFFILE ] ; then
   # get number of cores and set as default job argument
-  multithreaded="-j$(grep -c processor /proc/cpuinfo)"
+  multithreaded="-j$(grep -c processor /proc/cpuinfo)" || true
   # only allow whole numbers
   case "${multithreaded#-j}" in
     ''|*[!0-9]*|0*)
diff -Nru apt-build-0.12.43/debian/postinst apt-build-0.12.44/debian/postinst
--- apt-build-0.12.43/debian/postinst	2012-04-11 23:11:12.000000000 +0200
+++ apt-build-0.12.44/debian/postinst	2012-10-15 23:46:46.000000000 +0200
@@ -64,17 +64,14 @@
   
   
   # prepare sources.list entry
-  eval $(apt-config shell etcdir Dir::Etc)
-  eval $(apt-config shell sourceslist Dir::Etc::sourcelist)
-  eval $(apt-config shell sourcesparts Dir::Etc::sourceparts)
-  sourceslist=/"$etcdir""$sourceslist"
-  sourcesparts=/"$etcdir""$sourcesparts"
-  aptbuildsource="$sourcesparts"/apt-build.list
+  eval $(apt-config shell sourceslist Dir::Etc::sourcelist/f)
+  eval $(apt-config shell sourcesparts Dir::Etc::sourceparts/d)
+  aptbuildsource="$sourcesparts"apt-build.list
   debline="deb file:$repository_dir apt-build main"
   src_enabled="false"
   
   # run loop to prevent errors if some sources does not exist
-  for source in "$sourceslist" "$sourcesparts"/*.list ; do
+  for source in "$sourceslist" "$sourcesparts"*.list ; do
     if [ -e "$source" ] ; then
 	    # comment in all sources lists if asked
 	    if [ "$add_to_sourceslist" = "false" ] ; then

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: