Author: julianfoad
Date: Mon Jul 16 08:22:24 2018
New Revision: 1836007
URL: http://svn.apache.org/viewvc?rev=1836007&view=rev
Log:
* tools/dist/release.py
(create_tag): Take care not to commit a no-op when bumping version numbers
on the branch.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1836007&r1=1836006&r2=1836007&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Mon Jul 16 08:22:24 2018
@@ -818,11 +818,12 @@ def create_tag(args):
fd.seek(0, os.SEEK_SET)
lines = fd.readlines()
for i, line in enumerate(lines):
- if line.startswith(startofline):
+ if line.startswith(startofline + flat):
lines[i] = line.replace(flat, spare)
break
else:
- raise RuntimeError('Definition of %r not found' % startofline)
+ raise RuntimeError("Expected string %r not found in '%s'"
+ % (startofline + flat, fd.url))
fd.seek(0, os.SEEK_SET)
fd.writelines(lines)
