diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-09-14 17:47:26 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-09-14 17:47:26 -0400 |
| commit | 9df741675d7e36008869dfff46ccc602875dc091 (patch) | |
| tree | 1deafeacb302f9154586708ada7a240470aa6b4a /stap-server | |
| parent | b232fab3a271c4c787462295d7ffbeca750c1092 (diff) | |
| parent | 775c3771bb4a5f663a763d7c65b1571e24e4b212 (diff) | |
| download | systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.tar.gz systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.tar.xz systemtap-steved-9df741675d7e36008869dfff46ccc602875dc091.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
aclocal.m4
configure
doc/SystemTap_Tapset_Reference/Makefile.in
testsuite/aclocal.m4
testsuite/configure
Diffstat (limited to 'stap-server')
| -rwxr-xr-x | stap-server | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stap-server b/stap-server index a6539d44..3358bcf1 100755 --- a/stap-server +++ b/stap-server @@ -395,7 +395,7 @@ function package_response { # Compress the server's temporary directory into a .zip archive. (rm $zip_server && zip -r $zip_server `basename $tmpdir_server` > /dev/null) || \ - fatal "zip of request tree, $tmpdir_server, failed" + fatal "zip of server response tree, $tmpdir_server, failed" } # function: fatal [ MESSAGE ] |