[SCM] UNNAMED PROJECT branch, master, updated. 0.34-1-g52baa4d

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  52baa4d629a133f9763e7c7d485cfdc0735e654a (commit)
      from  cbff0ca7d8844f4c16580b1ae028464eedc543e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52baa4d629a133f9763e7c7d485cfdc0735e654a
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 14 10:38:12 2011 +0200

    Made jh_manifest always follow symlinks

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    7 +++++++
 jh_manifest      |    7 +++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb81c95..a88054a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.35) UNRELEASED; urgency=low
+
+  * Made jh_manifest always follow symlinks even if they are passed
+    via command line.  (Closes: #626329)
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 14 May 2011 10:35:48 +0200
+
 javatools (0.34) unstable; urgency=low
 
   * Fixed a regression in 0.33 that in some cases would make
diff --git a/jh_manifest b/jh_manifest
index b9c0ad2..2834a73 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -116,6 +116,13 @@ if(@ARGV){
     foreach my $jar (@ARGV){
         # Look for it in $dir if it does not exist directly.
         $jar = "$dir/$jar" unless -f $jar;
+        if ( -l $jar ){
+            # Follow links
+            my $dest = Cwd::abs_path($jar);
+            error("Cannot resolve link $jar: $!") unless $dest;
+            $jar = $dest;
+        }
+        error("Cannot update $jar: it does not exist.") unless -f $jar;
         update_jar($jar, undef);
     }
     inhibit_log();


hooks/post-receive
-- 
UNNAMED PROJECT