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

ACU/Grading.pm

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

ACU/Tinyglob.pm

@@ -12,7 +12,8 @@ our @EXPORT    = qw(tinyglob);
 
 sub tinyglob
 {
-    my @str = split("", quotemeta(shift));
+    my $orig = shift;
+    my @str = split("", quotemeta($orig));
     my $res = "";
 
     my $metaescape = 0;
@@ -38,7 +39,7 @@ sub tinyglob
 		$res .= '.*';
 	    }
 	    else {
-		croak "Invalid number of \\";
+		croak "Invalid number of \\ in '$orig'";
 	    }
 	}
 	else {

commands/manage-server.sh

@@ -100,6 +100,7 @@ do
 		git archive -o ./liblerdorf.tbz2 master
 		scp ./liblerdorf.tbz2 root@$DEST:
 		cd -
+		ssh root@$DEST rm -rf liblerdorf
 		ssh root@$DEST mkdir -p 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"