diff --git a/contrib/adc/rsync b/contrib/adc/rsync index 8c3e8b2..08861e7 100755 --- a/contrib/adc/rsync +++ b/contrib/adc/rsync @@ -34,8 +34,8 @@ die "I dont like '..' paths in $cmd\n" if $path =~ /\.\./; # ok now check if we're permitted to execute a $perm action on $path # (taken as a refex) using rsync. -my $ret = check_access('EXTCMD/rsync', "NAME/$path", $perm, 1); -die "$perm NAME/$path $ENV{GL_USER} $ret\n" if $ret =~ /DENIED/; +my $ret = check_access('EXTCMD/rsync', "VR_NAME/$path", $perm, 1); +die "$ret\n" if $ret =~ /DENIED/; wrap_chdir($RSYNC_BASE); log_it(); diff --git a/t/t66-vrs b/t/t66-vrs index 5e5d583..903b8c7 100644 --- a/t/t66-vrs +++ b/t/t66-vrs @@ -69,7 +69,7 @@ do expect_push_ok "master -> priv/u2/master" mdc makefile runlocal git push origin master:priv/u2/master - expect "remote: W VR_NAME/makefile u2 DENIED by VR_NAME/makefile" + expect "remote: W VR_NAME/makefile foo u2 DENIED by VR_NAME/makefile" expect "remote: error: hook declined to update refs/heads/priv/u2/master" name "u2 CAN push changes to makefile in priv2/u2/master" @@ -154,7 +154,7 @@ do cd foo mdc newfile runlocal git push - expect "remote: W VR_NAME-nf/newfile u2 DENIED by VR_NAME-nf/newfile" + expect "remote: W VR_NAME-nf/newfile foo u2 DENIED by VR_NAME-nf/newfile" expect "remote rejected.*hook declined" name "u1 pushes it for him" @@ -176,7 +176,7 @@ do cd foo runlocal git tag t1 runlocal git push origin t1 - expect "remote: W VR_NAME/makefile u2 DENIED by VR_NAME/makefile" + expect "remote: W VR_NAME/makefile foo u2 DENIED by VR_NAME/makefile" expect "remote: error: hook declined to update refs/tags/t1" name "u2 can add a tag that contains a file called ncfile" diff --git a/t/t69-bad-ref-file-names b/t/t69-bad-ref-file-names index 96732e0..98dc2ee 100644 --- a/t/t69-bad-ref-file-names +++ b/t/t69-bad-ref-file-names @@ -79,7 +79,7 @@ name "push file aa=bb fail" mdc aa=bb runlocal git push origin HEAD expect "To u1:aa" -expect "remote: invalid characters in ref or filename: NAME/aa=bb" +expect "remote: invalid characters in ref or filename: VR_NAME/aa=bb" expect "remote: error: hook declined to update refs/heads/master" expect "\[remote rejected\] HEAD -> master (hook declined)" expect "error: failed to push some refs to 'u1:aa'"