fedora-rpmdevtools fedora-diffarchive, 1.3, 1.4 fedora-extract, 1.2, 1.3 fedora-rpmdevtools.spec, 1.91, 1.92

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	fedora-diffarchive fedora-extract fedora-rpmdevtools.spec 
Log Message:
Improve diffarchive and extract error messages, release 1.5.


Index: fedora-diffarchive
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-diffarchive,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-diffarchive	8 Feb 2006 18:57:53 -0000	1.3
+++ fedora-diffarchive	26 Feb 2006 15:53:55 -0000	1.4
@@ -44,6 +44,14 @@
     usage
     exit 1
 fi
+for file in "$1" "$2" ; do
+    if [ ! -f "$file" ] ; then
+        [ -e "$file" ] && \
+            echo "Error: not a regular file: '$file'" >&2 ||
+            echo "Error: file does not exist: '$file'" >&2
+        exit 1
+    fi
+done
 
 diffopts="-r ${diffopts:--Nu}"
 


Index: fedora-extract
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-extract,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-extract	9 Feb 2006 19:29:10 -0000	1.2
+++ fedora-extract	26 Feb 2006 15:53:55 -0000	1.3
@@ -150,7 +150,20 @@
 done
 shift $(( $OPTIND -1 ))
 
+if [ ! -d "$dir" ] ; then
+    [ -e "$dir" ] && \
+        echo "Error: not a directory: '$dir'" >&2 ||
+        echo "Error: directory does not exist: '$dir'" >&2
+    exit 1
+fi
+
 for file in "$@" ; do
+    if [ ! -f "$file" ] ; then
+        [ -e "$file" ] && \
+            echo "Error: not a regular file: '$file'" >&2 ||
+            echo "Error: file does not exist: '$file'" >&2
+        exit 1
+    fi
     # Not that fancy at the moment, but -q is for backwards compatibility
     # and in case we need to do more fine-grained stuff for some unarchivers
     # later.


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- fedora-rpmdevtools.spec	24 Feb 2006 16:56:04 -0000	1.91
+++ fedora-rpmdevtools.spec	26 Feb 2006 15:53:55 -0000	1.92
@@ -3,8 +3,8 @@
 %define spectool_version   1.0.7
 
 Name:           fedora-rpmdevtools
-Version:        1.4
-Release:        2%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        Fedora RPM Development Tools
 
 Group:          Development/Tools
@@ -119,7 +119,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/fedora
-%{_datadir}/fedora
+%{_datadir}/fedora/
 %{_bindir}/fedora-*
 %{_bindir}/spectool
 %{_prefix}/lib/rpm/check-*
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Sun Feb 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.5-1
+- Improve diffarchive and extract error messages.
+
 * Fri Feb 24 2006 Ville Skyttä <ville.skytta at iki.fi>
 - Update spectool to 1.0.7 (#162253).