diff options
| author | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2011-12-30 12:51:56 +0000 |
|---|---|---|
| committer | Johannes Dahlström <johannes.dahlstrom@vaadin.com> | 2011-12-30 12:51:56 +0000 |
| commit | dd786ffd3554828e91d4398bc9a3ce6e498f74b2 (patch) | |
| tree | b95585606d711c925477cdaea23b4e31fcf68c97 /build/bin | |
| parent | 02daee926e0bb40bcd8a321a2a27570da5c9c928 (diff) | |
| download | vaadin-framework-dd786ffd3554828e91d4398bc9a3ce6e498f74b2.tar.gz vaadin-framework-dd786ffd3554828e91d4398bc9a3ce6e498f74b2.zip | |
Merged changes from 6.7
svn changeset:22500/svn branch:6.8
Diffstat (limited to 'build/bin')
| -rw-r--r-- | build/bin/tagrelease.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/bin/tagrelease.py b/build/bin/tagrelease.py index 8745553596..0101ecdbd6 100644 --- a/build/bin/tagrelease.py +++ b/build/bin/tagrelease.py @@ -95,7 +95,7 @@ def tagCommand(version, changeset, bookRepo): tagUrl = repoRoot+"/releases/"+version # Book tag parameters - if not re.search(r'branches/[0-9\.]+$', bookRepo): + if (not re.search(r'branches/[0-9\.]+$', bookRepo)) and (not re.search(r'doc/trunk$', bookRepo)): print "Bad documentation branch '%s' for release." % (bookRepo) sys.exit(1) bookTagUrl = repoRoot+"/doc/tags/"+version |