jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 56531): Ignore Version ID for SVN repository
......................................................................
(Bug 56531): Ignore Version ID for SVN repository
SVN repository does not replace ID keyword and searching for
the keyword ID does raise an exception.
Thus we ignore that part of code.
Maybe we could get this information from version.py but because
that code does not work properly yet, this could be a second
part.
Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71
---
M pywikibot/bot.py
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
Pyfisch: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index b885a6a..2db129f 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -3,7 +3,7 @@
User-interface related functions for building bots
"""
#
-# (C) Pywikibot team, 2008-2012
+# (C) Pywikibot team, 2008-2013
#
# Distributed under the terms of the MIT license.
#
@@ -20,6 +20,7 @@
import os
import os.path
import sys
+import re
_logger = "bot"
@@ -244,7 +245,7 @@
except AttributeError:
return
- log(u'=== Pywikipediabot framework v2.0 -- Logging header ===')
+ log(u'=== Pywikibot framework v2.0 -- Logging header ===')
# script call
log(u'COMMAND: %s' % unicode(sys.argv))
@@ -625,8 +626,6 @@
init_handlers()
if config.verbose_output:
- import re
- ver = pywikibot.__version__ # probably can be improved on
# Please don't change the regular expression here unless you really
# have to - some git versions (like 1.7.0.4) seem to treat lines
# containing just `$Id:` as if they were ident lines (see
@@ -634,8 +633,13 @@
# replacement with `$Id$`
# or `$Id$`.
m = re.search(r"\$Id"
- r": (\w+) \$", ver)
- pywikibot.output(u'Pywikipediabot r%s' % m.group(1))
+ r": (\w+) \$", pywikibot.__version__)
+ if m:
+ pywikibot.output(u'Pywikibot r%s' % m.group(1))
+ else:
+ # Version ID not availlable on SVN repository.
+ # Maybe these informations should be imported from version.py
+ pywikibot.output(u'Pywikibot SVN repository')
pywikibot.output(u'Python %s' % sys.version)
if do_help:
--
To view, visit https://gerrit.wikimedia.org/r/93313
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd7384908ebc6409aee17c435f659681bd530f71
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Pyfisch <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
