[SCM] UNNAMED PROJECT branch, master, updated. 0.35-2-gfef097b

[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  fef097bd65c67f40858ecb6baa0ef6b8b0cd6cea (commit)
      from  97229816284e473df8524ec40e4d00e35d1f703d (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 fef097bd65c67f40858ecb6baa0ef6b8b0cd6cea
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jun 4 13:19:45 2011 +0200

    Do not strip leading "/" unconditionally in jh_manifest
    
    Occasionally it is given the absolute path to a jar and that
    should still work.

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

Summary of changes:
 jh_manifest    |   10 ++++++----
 tests/tests.sh |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jh_manifest b/jh_manifest
index dac99c6..55aca49 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -118,11 +118,13 @@ if(@ARGV){
         my $orig = $jar;
         my $target = $jar;
         my $link = 0;
-        # strip any leading / or ./ - it looks better and it
-        # does not accidentally install a system install jar instead.
-        $target =~ s@^\.?/+@@og;
         # Look for it in $dir if it does not exist directly.
-        $target = "$dir/$target" unless -f $target;
+        unless (-f $target) {
+            # strip any leading / or ./ - it looks better and it
+            # does not accidentally install a system install jar instead.
+            $target =~ s@^\.?/+@@og;
+            $target = "$dir/$target";
+        }
         if ( -l $jar ){
             # Follow links
             my $dest = Cwd::abs_path($target);
diff --git a/tests/tests.sh b/tests/tests.sh
index 6f87db7..28f9669 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -21,6 +21,7 @@ fi
 run_jh_manifest()
 {
     cd ..
+    echo "Running: perl -I./lib ./jh_manifest \"$@\""
     perl -I./lib ./jh_manifest "$@"
     cd "$_DIR"
 }


hooks/post-receive
-- 
UNNAMED PROJECT