Author: danielsh
Date: Sat Feb 21 00:05:13 2015
New Revision: 1661249
URL: http://svn.apache.org/r1661249
Log:
backport.pl: Track downstream changes.
* tools/dist/backport.pl
(shell_safe_path_or_url): Add parentheses to silence a Perl warning.
* tools/dist/backport_tests.py
(*): Track incompatible svntest API change in r1658410, affecting
run_and_verify_svnadmin() and run_and_verify_svnlook().
Modified:
subversion/trunk/tools/dist/backport.pl
subversion/trunk/tools/dist/backport_tests.py
Modified: subversion/trunk/tools/dist/backport.pl
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1661249&r1=1661248&r2=1661249&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sat Feb 21 00:05:13 2015
@@ -3,6 +3,8 @@ use warnings;
use strict;
use feature qw/switch say/;
+#no warnings 'experimental::smartmatch';
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -286,7 +288,7 @@ sub shell_escape {
sub shell_safe_path_or_url($) {
local $_ = shift;
- return m{^[A-Za-z0-9._:+/-]+$} and !/^-|^[+]/;
+ return (m{^[A-Za-z0-9._:+/-]+$} and !/^-|^[+]/);
}
# Shell-safety-validating wrapper for File::Temp::tempfile
Modified: subversion/trunk/tools/dist/backport_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport_tests.py?rev=1661249&r1=1661248&r2=1661249&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport_tests.py (original)
+++ subversion/trunk/tools/dist/backport_tests.py Sat Feb 21 00:05:13 2015
@@ -210,12 +210,12 @@ def verify_backport(sbox, expected_dump_
# mirror repository in preparation for the comparison dump.
svntest.actions.enable_revprop_changes(sbox.repo_dir)
for revnum in range(0, 1+int(sbox.youngest())):
- svntest.actions.run_and_verify_svnadmin(None, [], [],
+ svntest.actions.run_and_verify_svnadmin([], [],
"delrevprop", "-r", revnum, sbox.repo_dir, "svn:date")
# Create a dump file from the mirror repository.
dest_dump = open(expected_dump_file).readlines()
- svntest.actions.run_and_verify_svnadmin(None, None, [],
+ svntest.actions.run_and_verify_svnadmin(None, [],
'setuuid', '--', sbox.repo_dir, uuid)
src_dump = svntest.actions.run_and_verify_dump(sbox.repo_dir)
@@ -265,7 +265,7 @@ def backport_two_approveds(sbox):
# Now back up and do three entries.
# r9: revert r7, r8
- svntest.actions.run_and_verify_svnlook(None, ["8\n"], [],
+ svntest.actions.run_and_verify_svnlook(["8\n"], [],
'youngest', sbox.repo_dir)
sbox.simple_update()
svntest.main.run_svn(None, 'merge', '-r8:6',
