fedora-rpmdevtools rpmdev-extract, 1.1, 1.2 rpmdevtools.spec, 1.34, 1.35 rpmls, 1.1, 1.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13684

Modified Files:
	rpmdev-extract rpmdevtools.spec rpmls 
Log Message:
Work around #250990 in rpmls and rpmdev-extract.


Index: rpmdev-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdev-extract,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmdev-extract	20 Aug 2006 15:40:44 -0000	1.1
+++ rpmdev-extract	6 Aug 2007 14:42:34 -0000	1.2
@@ -27,12 +27,14 @@
 force=
 dir=
 
+shopt -s extglob
+
 version()
 {
     cat <<EOF
-rpmdev-extract version 1.0
+rpmdev-extract version 1.1
 
-Copyright (c) 2004-2006 Fedora Project <http://fedoraproject.org/>.
+Copyright (c) 2004-2007 Fedora Project <http://fedoraproject.org/>.
 This  program is licensed under the GNU General Public License, see the
 file COPYING included in the distribution archive.
 
@@ -142,7 +144,11 @@
             cabextract -f "$f"
             ;;
         rpm)
-            name=`rpm -qp --qf "%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            name=`rpm -qp --qf="%{NAME}-%{VERSION}-%{RELEASE}" "$f"`
+            if [ -z "$name" ] ; then # workaround for #250990
+                bname="`basename "$f"`"
+                name=${bname/?(\.*([^\.]))\.rpm/}
+            fi
             mkdir -p "$name"
             cd "$name"
             rpm2cpio "$f" \


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rpmdevtools.spec	7 Jul 2007 08:56:36 -0000	1.34
+++ rpmdevtools.spec	6 Aug 2007 14:42:34 -0000	1.35
@@ -110,6 +110,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Work around #250990 in rpmls and rpmdev-extract.
+
 * Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
 - The long form of the list option in rmdevelrpms is --list-only, not --list.


Index: rpmls
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmls,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmls	16 Jun 2007 21:21:26 -0000	1.1
+++ rpmls	6 Aug 2007 14:42:34 -0000	1.2
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+unset CDPATH
+
 owner=
 if [ "$1" = "-l" ] ; then
     owner='%-8{fileusername} %-8{filegroupname} '
@@ -23,8 +25,15 @@
 fi
 qf="[%-11{filemodes:perms} $owner%{filenames}\\n]"
 
-for file in "$@" ; do
-    p=
-    case "$file" in *.[rs]pm) p=p ;; esac
-    rpm -q$p --qf="$qf" "$file"
+for arg in "$@" ; do
+    case "$arg" in
+        *.[rs]pm)
+            # dirname/basename: workaround for #250990
+            cd "$(dirname "$arg")"
+            rpm -qp --qf="$qf" "$(basename "$arg")"
+            cd - >/dev/null 2>&1
+            ;;
+        *)
+            rpm -q --qf="$qf" "$arg"
+    esac
 done