[SCM] UNNAMED PROJECT branch, master, updated. 0.35-1-g9722981

[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  97229816284e473df8524ec40e4d00e35d1f703d (commit)
      from  728e8e1564e64c99b478ba92540b3b76302dc8b7 (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 97229816284e473df8524ec40e4d00e35d1f703d
Author: Niels Thykier <niels at thykier.net>
Date:   Wed May 25 10:44:09 2011 +0200

    Really made jh_manifest follow symlinks this time

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

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

diff --git a/debian/changelog b/debian/changelog
index 130ffbe..1d81a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.36) UNRELEASED; urgency=low
+
+  * Made jh_manifest always follow symlinks - the fix for this in
+    0.35 was incomplete.  (Closes: #626329)
+
+ -- Niels Thykier <niels at thykier.net>  Wed, 25 May 2011 10:43:07 +0200
+
 javatools (0.35) unstable; urgency=low
 
   * Made jh_manifest always follow symlinks even if they are passed
diff --git a/jh_manifest b/jh_manifest
index 6d368b2..dac99c6 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -137,7 +137,7 @@ if(@ARGV){
         } else {
             verbose_print("Updating $target");
         }
-        update_jar($jar, undef) unless $dh{NO_ACT};
+        update_jar($target, undef) unless $dh{NO_ACT};
     }
     inhibit_log();
     # behave like the old jh_manifest.
@@ -188,7 +188,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
         my $manifest = $manifests->{$link};
         my $lp = $path;
         next unless(defined($manifest));
-        error("Cannot modify $link - it is a broken symlink or not possible to resolve,") unless( defined($path) && -e $path );
+        error("Cannot modify $link - it is a broken symlink or not possible to resolve,")
+            unless( defined($path) && -e $path );
         $lp =~ s@^\Q$fulldir\E/*@@;
         error("Conflicting manifests for $link (link) and $path,") if(exists($manifests->{$lp}));
         delete($files->{$lp});


hooks/post-receive
-- 
UNNAMED PROJECT