Merge branch 'master' of ssh://cpp/liblerdorf
This commit is contained in:
commit
757733176b
3 changed files with 17 additions and 9 deletions
|
@ -344,6 +344,7 @@ sub compute ($$$;$$$)
|
||||||
|
|
||||||
if (defined $ref)
|
if (defined $ref)
|
||||||
{
|
{
|
||||||
|
eval {
|
||||||
my $glob = Tinyglob::tinyglob($ref);
|
my $glob = Tinyglob::tinyglob($ref);
|
||||||
if ($glob ne $ref)
|
if ($glob ne $ref)
|
||||||
{
|
{
|
||||||
|
@ -353,6 +354,11 @@ sub compute ($$$;$$$)
|
||||||
}
|
}
|
||||||
$ids->{ $ref } = $value;
|
$ids->{ $ref } = $value;
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
if ($@) {
|
||||||
|
my $err = $@;
|
||||||
|
log ERROR, $@;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
my $ret = undef;
|
my $ret = undef;
|
||||||
|
|
|
@ -12,7 +12,8 @@ our @EXPORT = qw(tinyglob);
|
||||||
|
|
||||||
sub tinyglob
|
sub tinyglob
|
||||||
{
|
{
|
||||||
my @str = split("", quotemeta(shift));
|
my $orig = shift;
|
||||||
|
my @str = split("", quotemeta($orig));
|
||||||
my $res = "";
|
my $res = "";
|
||||||
|
|
||||||
my $metaescape = 0;
|
my $metaescape = 0;
|
||||||
|
@ -38,7 +39,7 @@ sub tinyglob
|
||||||
$res .= '.*';
|
$res .= '.*';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
croak "Invalid number of \\";
|
croak "Invalid number of \\ in '$orig'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -100,6 +100,7 @@ do
|
||||||
git archive -o ./liblerdorf.tbz2 master
|
git archive -o ./liblerdorf.tbz2 master
|
||||||
scp ./liblerdorf.tbz2 root@$DEST:
|
scp ./liblerdorf.tbz2 root@$DEST:
|
||||||
cd -
|
cd -
|
||||||
|
ssh root@$DEST rm -rf liblerdorf
|
||||||
ssh root@$DEST mkdir -p liblerdorf
|
ssh root@$DEST mkdir -p liblerdorf
|
||||||
ssh root@$DEST tar xf ./liblerdorf.tbz2 -C liblerdorf
|
ssh root@$DEST tar xf ./liblerdorf.tbz2 -C liblerdorf
|
||||||
ssh root@$DEST "DEST=/usr/local/lib/perl5/5.14/ACU make -C liblerdorf upgrade"
|
ssh root@$DEST "DEST=/usr/local/lib/perl5/5.14/ACU make -C liblerdorf upgrade"
|
||||||
|
|
Reference in a new issue