packages (rpm-4_5): rpm/rpm-builddir-readlink.patch - avoid this in the fut...

[glen]

Author: glen                         Date: Wed Jan 27 19:16:37 2010 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- avoid this in the future, report error when sources can't be extracted

---- Files affected:
packages/rpm:
   rpm-builddir-readlink.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-builddir-readlink.patch
diff -u packages/rpm/rpm-builddir-readlink.patch:1.1.2.1 packages/rpm/rpm-builddir-readlink.patch:1.1.2.2
--- packages/rpm/rpm-builddir-readlink.patch:1.1.2.1	Wed Jan 27 19:32:08 2010
+++ packages/rpm/rpm-builddir-readlink.patch	Wed Jan 27 20:16:32 2010
@@ -1,13 +1,26 @@
 --- rpm-4.5/scripts/find-debuginfo.sh~	2010-01-27 19:25:48.000000000 +0200
 +++ rpm-4.5/scripts/find-debuginfo.sh	2010-01-27 20:23:37.279516094 +0200
-@@ -24,6 +24,10 @@
+@@ -24,6 +24,11 @@
  # Barf on missing build IDs.
  strict=false
  
 +# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path
 +# and debugedit will ignore them as they are out of build dir.
 +RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR")
++echo "RPM_BUILD_DIR=$RPM_BUILD_DIR"
 +
  BUILDDIR=.
  out=debugfiles.list
  nout=0
+@@ -201,6 +203,11 @@
+     $strict && exit 2
+   fi
+ 
++  if [ ! -s "$SOURCEFILE" ]; then
++    echo >&2 "*** ERROR: no sources found for $f (stripped without sourcefile information?)"
++    exit 2
++  fi
++
+   # A binary already copied into /usr/lib/debug doesn't get stripped,
+   # just has its file names collected and adjusted.
+   case "$dn" in
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-builddir-readlink.patch?r1=1.1.2.1&r2=1.1.2.2&f=u