epita-std/ACU
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of ssh://cpp/liblerdorf

Browse source
This commit is contained in:
Root Cpp Charlie 2013-09-30 13:08:55 +02:00
commit 757733176b
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ACU/Grading.pm
View file

@ -344,14 +344,20 @@ sub compute ($$$;$$$)
if (defined $ref) if (defined $ref)
{ {
my $glob = Tinyglob::tinyglob($ref); eval {
if ($glob ne $ref) my $glob = Tinyglob::tinyglob($ref);
{ if ($glob ne $ref)
my $value = 0; {
for my $r (grep { /^$glob$/ } keys %$ids) { my $value = 0;
$value += $ids->{ $r }; for my $r (grep { /^$glob$/ } keys %$ids) {
$value += $ids->{ $r };
}
$ids->{ $ref } = $value;
} }
$ids->{ $ref } = $value; };
if ($@) {
my $err = $@;
log ERROR, $@;
} }
} }

5
ACU/Tinyglob.pm
View file

@ -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 {

1
commands/manage-server.sh
View file

@ -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"