jenkins-bot has submitted this change and it was merged.
Change subject: [FIX] Support branched svn directories
......................................................................
[FIX] Support branched svn directories
Bug: 61310
Change-Id: I1fe2aa0c2cec2b569af5bf0f8b2e0e8f863ee358
---
M pywikibot/version.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 1c77acb..c81bfbd 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -56,6 +56,8 @@
_program_dir = _get_program_dir()
if os.path.isdir(os.path.join(_program_dir, '.svn')):
(tag, rev, date, hsh) = getversion_svn(_program_dir)
+ elif os.path.isdir(os.path.join(_program_dir, '../.svn')):
+ (tag, rev, date, hsh) = getversion_svn(os.path.join(_program_dir,
'..'))
else:
(tag, rev, date, hsh) = getversion_git(_program_dir)
except Exception:
--
To view, visit
https://gerrit.wikimedia.org/r/157808
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1fe2aa0c2cec2b569af5bf0f8b2e0e8f863ee358
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot <>