jenkins-bot has submitted this change and it was merged.
Change subject: Report when cacerts is missing
......................................................................
Report when cacerts is missing
Bug: T97392
Change-Id: I5598cf0767b49e6e18bc1a26daff4cb3f82ffad3
---
M scripts/version.py
M tox.ini
2 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
XZise: Looks good to me, but someone else must approve
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/version.py b/scripts/version.py
index 17d0b4b..ca57686 100755
--- a/scripts/version.py
+++ b/scripts/version.py
@@ -22,8 +22,11 @@
except ImportError:
httplib2 = {'__version__': 'n/a'}
+WMF_CACERT = 'MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs'
+
def check_environ(environ_name):
+ """Print environment variable."""
pywikibot.output('{0}: {1}'.format(environ_name,
os.environ.get(environ_name, 'Not set')))
@@ -31,16 +34,25 @@
pywikibot.output('Pywikibot: %s' % getversion())
pywikibot.output('Release version: %s' % pywikibot.__release__)
pywikibot.output('httplib2 version: %s' % httplib2.__version__)
- if not hasattr(httplib2, 'CA_CERTS'):
- httplib2.CA_CERTS = ''
- pywikibot.output(' cacerts: %s' % httplib2.CA_CERTS)
+
has_wikimedia_cert = False
- if os.path.isfile(httplib2.CA_CERTS):
+ if not hasattr(httplib2, 'CA_CERTS') or not httplib2.CA_CERTS:
+ pywikibot.output(' cacerts: not defined')
+ elif not os.path.isfile(httplib2.CA_CERTS):
+ pywikibot.output(' cacerts: %s (missing)' % httplib2.CA_CERTS)
+ else:
+ pywikibot.output(' cacerts: %s' % httplib2.CA_CERTS)
+
with open(httplib2.CA_CERTS, 'r') as cert_file:
text = cert_file.read()
- if
'MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs' in text:
+ if WMF_CACERT in text:
has_wikimedia_cert = True
- pywikibot.output(u' certificate test: %s' % ('ok' if has_wikimedia_cert
else 'not ok'))
+ pywikibot.output(u' certificate test: %s'
+ % ('ok' if has_wikimedia_cert else 'not ok'))
+ if not has_wikimedia_cert:
+ pywikibot.output(
+ ' Please reinstall httplib2 or run git submodules update!')
+
pywikibot.output('Python: %s' % sys.version)
normalize_text = u'\u092e\u093e\u0930\u094d\u0915
\u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917'
diff --git a/tox.ini b/tox.ini
index 21635da..ef3fa9c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -92,6 +92,7 @@
scripts/transferbot.py \
scripts/unusedfiles.py \
scripts/upload.py \
+ scripts/version.py \
scripts/watchlist.py \
setup.py \
tests/__init__.py \
--
To view, visit https://gerrit.wikimedia.org/r/208004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5598cf0767b49e6e18bc1a26daff4cb3f82ffad3
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Mpaa <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
