Ottomata has submitted this change and it was merged.
Change subject: add. handle VersionConflict and require flask-login ver 0.1.2.
......................................................................
add. handle VersionConflict and require flask-login ver 0.1.2.
Change-Id: I9a1b3d0b0125cfb417feb0ae63af4beab0cd8bb3
---
M templates/misc/e3-metrics.settings.py.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/templates/misc/e3-metrics.settings.py.erb
b/templates/misc/e3-metrics.settings.py.erb
index 98412cb..c51a1c9 100644
--- a/templates/misc/e3-metrics.settings.py.erb
+++ b/templates/misc/e3-metrics.settings.py.erb
@@ -1,6 +1,6 @@
from user_metrics.config import logging
-from pkg_resources import WorkingSet , DistributionNotFound
+from pkg_resources import WorkingSet , DistributionNotFound, VersionConflict
# Get working set of Python modules
working_set = WorkingSet()
@@ -29,10 +29,10 @@
__secret_key__ = '<%= secret_key %>'
try:
- working_set.require('Flask-Login>=0.1.3')
+ working_set.require('Flask-Login>=0.1.2')
__flask_login_exists__ = True
logging.debug(__name__ + ' :: Using module flask.ext.login...')
-except DistributionNotFound:
+except (DistributionNotFound, VersionConflict):
__flask_login_exists__ = False
logging.debug(__name__ + ' :: Can\'t find module flask.ext.login...')
--
To view, visit https://gerrit.wikimedia.org/r/54602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a1b3d0b0125cfb417feb0ae63af4beab0cd8bb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rfaulk <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
