Author: danielsh
Date: Mon May 27 04:40:47 2013
New Revision: 1486513
URL: http://svn.apache.org/r1486513
Log:
svnpubsub: be more careful when shelling out.
[in tools/server-side/svnpubsub]
* commit-hook.py
(svnlook_uuid, svnlook_info, svnlook_changed):
* revprop-change-hook.py
(svnlook_uuid, svnlook_revprop):
Add an "--" end-of-arguments terminator, to escape REPOS_DIR and PROPNAME.
Modified:
subversion/trunk/tools/server-side/svnpubsub/commit-hook.py
subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py
Modified: subversion/trunk/tools/server-side/svnpubsub/commit-hook.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/commit-hook.py?rev=1486513&r1=1486512&r2=1486513&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/commit-hook.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/commit-hook.py Mon May 27
04:40:47 2013
@@ -37,11 +37,11 @@ def svnlook(cmd, **kwargs):
return svnpubsub.util.check_output(args, **kwargs)
def svnlook_uuid(repo):
- cmd = ["uuid", repo]
+ cmd = ["uuid", "--", repo]
return svnlook(cmd).strip()
def svnlook_info(repo, revision):
- cmd = ["info", "-r", revision, repo]
+ cmd = ["info", "-r", revision, "--", repo]
data = svnlook(cmd, universal_newlines=True).split("\n")
#print data
return {'author': data[0].strip(),
@@ -49,7 +49,7 @@ def svnlook_info(repo, revision):
'log': "\n".join(data[3:]).strip()}
def svnlook_changed(repo, revision):
- cmd = ["changed", "-r", revision, repo]
+ cmd = ["changed", "-r", revision, "--", repo]
lines = svnlook(cmd, universal_newlines=True).split("\n")
changed = {}
for line in lines:
Modified: subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py?rev=1486513&r1=1486512&r2=1486513&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py
(original)
+++ subversion/trunk/tools/server-side/svnpubsub/revprop-change-hook.py Mon May
27 04:40:47 2013
@@ -38,11 +38,11 @@ def svnlook(cmd, **kwargs):
return svnpubsub.util.check_output(args, **kwargs)
def svnlook_uuid(repo):
- cmd = ["uuid", repo]
+ cmd = ["uuid", "--", repo]
return svnlook(cmd).strip()
def svnlook_revprop(repo, revision, propname):
- cmd = ["propget", "-r", revision, "--revprop", repo, propname]
+ cmd = ["propget", "-r", revision, "--revprop", "--", repo, propname]
data = svnlook(cmd)
#print data
return data
