[SCM] UNNAMED PROJECT branch, master, updated. 0.40-7-gd67fe25

[Niels Thykier]

The following commit has been merged in the master branch:
commit d67fe254bf31dcdd938c3c2d7e4a0cbf5dfe8f22
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Mar 12 08:31:05 2012 +0100

    jh_manifest: produce cleaner error message for non-existent jar
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 727fd7b..07b7008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 javatools (0.41) UNRELEASED; urgency=low
 
+  [ Sylvestre Ledru ]
   * jh_makepkg: 
     - Switch the OpenJDK6 path to the multiarch one.
     - Remove the sun-java6 support since it has been
@@ -7,6 +8,10 @@ javatools (0.41) UNRELEASED; urgency=low
     - Provide the support for OpenJDK 7
     - Create the new package under the source format 3.0
     - -doc packages are now in the doc section.
+
+  [ Niels Thykier ]
+  * Produce a better error message when a non-existent Jar file is
+    passed to jh_manifest.
 	
 	
  -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 24 Feb 2012 16:22:58 +0100
diff --git a/jh_manifest b/jh_manifest
index 55aca49..d1418f4 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -123,6 +123,8 @@ if(@ARGV){
             # strip any leading / or ./ - it looks better and it
             # does not accidentally install a system install jar instead.
             $target =~ s@^\.?/+@@og;
+            # Bail unless $dir/$target exists
+            error ("$target: $!") unless -f "$dir/$target";
             $target = "$dir/$target";
         }
         if ( -l $jar ){

-- 
UNNAMED PROJECT