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 21687e5942bab1c6a6672322dfa56f41abf7a906 (commit)
from e98ba87ac6969eb6d1808481f8fe2ceab7a44761 (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 21687e5942bab1c6a6672322dfa56f41abf7a906
Author: Niels Thykier <ni...@thykier.net>
Date: Tue Aug 3 20:46:35 2010 +0200
Fixed a number of "hidden" bugs in jh_manifest and Java.pm
-----------------------------------------------------------------------
Summary of changes:
Java.pm | 9 +++++++--
jh_manifest | 17 ++++++++++-------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Java.pm b/Java.pm
index 3651c87..229c362 100644
--- a/Java.pm
+++ b/Java.pm
@@ -139,6 +139,7 @@ sub slurp_file{
open(my $handle, "<", $file) or die("$file: $!");
while(my $line = <$handle> ){
chomp($line);
+ $line =~ s/\r$//o;
push(@data, $line);
}
close($handle);
@@ -188,8 +189,12 @@ sub parse_manifest_fd{
$sec->set_value($atname, $atval);
}
}
- ($atname, $atval) = split(/ :\s /ox, $line);
- die("Expected <attr>: <val> pair in $name,") unless($atval);
+ ($atname, $atval) = split(/ :\s /ox, $line, 2);
+ if(!$atval){
+ die("Expected <attr>: <val> pair in $name,")
+ unless($line =~ m/ :\s /ox);
+ $atval = '';
+ }
if(!defined($sec)){
die("A section must start with the Name attribute in $name,")
unless(lc($atname) eq 'name');
diff --git a/jh_manifest b/jh_manifest
index edea175..ce40882 100755
--- a/jh_manifest
+++ b/jh_manifest
@@ -142,12 +142,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
while( my $jar = <$jarfiles> ) {
chomp($jar);
if( -l $jar ) {
- $jar =~ s...@^$dir/*@@;
+ $jar =~ s...@^\q$dir\e/*@@;
verbose_print("Found symlink $jar");
push(@links, $jar);
} else {
$jar = Cwd::abs_path($jar);
- $jar =~ s...@^$fulldir/*@@;
+ $jar =~ s...@^\q$fulldir\e/*@@;
verbose_print("Found $jar");
$files->{$jar} = 1;
}
@@ -163,17 +163,20 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
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 );
- $lp =~ s...@^$fulldir/*@@;
+ $lp =~ s...@^\q$fulldir\e/*@@;
error("Conflicting manifests for $link (link) and $path,")
if(exists($manifests->{$lp}));
delete($files->{$lp});
delete($manifests->{$link});
verbose_print("Updating symlinked $path (using manifest for $link)");
- update_jar($path, $manifest);
+ update_jar("$path", $manifest);
}
foreach my $jar (keys(%$files)){
- my $manifest = $manifests->{$jar};
- delete($manifests->{$jar});
- update_jar("$dir/$jar", $manifest);
+ my $lp = $jar;
+ my $manifest;
+ $lp =~ s...@^\q$fulldir\e/*@@;
+ $manifest = $manifests->{$lp};
+ delete($manifests->{$lp});
+ update_jar("$dir/$lp", $manifest);
}
foreach my $unused (keys(%$manifests)){
# complain - unless it has been ignored of course.
hooks/post-receive
--
UNNAMED PROJECT
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
