[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Sort backend provided types when displaying help

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350364 )

Change subject: Sort backend provided types when displaying help
..


Sort backend provided types when displaying help

Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
---
M debian/changelog
M scripts/webservice
2 files changed, 2 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 74fac67..317a84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 toollabs-webservice (0.37) trusty; urgency=medium
 
   * Always cleanup manifest on stop
+  * Sort backend provided types when displaying help
 
  -- Bryan Davis   Wed, 25 Apr 2017 04:01:13 +
 
diff --git a/scripts/webservice b/scripts/webservice
index bcd599c..ae32246 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -122,7 +122,7 @@
 args.extra_args = tool.manifest.get('web::extra_args', None)
 
 if args.type not in acceptable_types:
-print("type must be one of ", ','.join(acceptable_types))
+print("type must be one of ", ','.join(sorted(acceptable_types)))
 sys.exit(1)
 
 if backend == 'gridengine':

-- 
To view, visit https://gerrit.wikimedia.org/r/350364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...tools-webservice[master]: Sort backend provided types when displaying help

[BryanDavis (Code Review)]

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/350364 )

Change subject: Sort backend provided types when displaying help
..

Sort backend provided types when displaying help

Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
---
M debian/changelog
M scripts/webservice
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/tools-webservice 
refs/changes/64/350364/1

diff --git a/debian/changelog b/debian/changelog
index 74fac67..317a84d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 toollabs-webservice (0.37) trusty; urgency=medium
 
   * Always cleanup manifest on stop
+  * Sort backend provided types when displaying help
 
  -- Bryan Davis   Wed, 25 Apr 2017 04:01:13 +
 
diff --git a/scripts/webservice b/scripts/webservice
index bcd599c..ae32246 100755
--- a/scripts/webservice
+++ b/scripts/webservice
@@ -122,7 +122,7 @@
 args.extra_args = tool.manifest.get('web::extra_args', None)
 
 if args.type not in acceptable_types:
-print("type must be one of ", ','.join(acceptable_types))
+print("type must be one of ", ','.join(sorted(acceptable_types)))
 sys.exit(1)
 
 if backend == 'gridengine':

-- 
To view, visit https://gerrit.wikimedia.org/r/350364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f23a221d65c184648b91bedbbdc912b6597270a
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/tools-webservice
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits