Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70244
Change subject: removed 'disabled' and 'wmf' from the script
......................................................................
removed 'disabled' and 'wmf' from the script
Change-Id: If9cb7f3bcab1f9eb7aaf400e9e8cf8ff7d3500d0
---
M maintenance/vclopt.py
1 file changed, 4 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/44/70244/1
diff --git a/maintenance/vclopt.py b/maintenance/vclopt.py
index 16a7eae..00adee5 100644
--- a/maintenance/vclopt.py
+++ b/maintenance/vclopt.py
@@ -17,13 +17,9 @@
comment = comment.strip(' \t/')
if conf is not None:
comment = conf['comment'] if 'comment' in conf else comment
- disabled = '(DISABLED)'
- if comment.endswith(disabled):
- comment = comment[:-len(disabled)].strip()
- if 'enabled' in conf and not conf['enabled']:
- comment += ' ' + disabled
+ comment = comment.strip()
if comment != '':
- comment = ' // ' + comment.strip()
+ comment = ' // ' + comment
write(dst, 'acl carrier_%s {%s\n' % (id.replace('-','_'), comment))
def printConflicts(confs, extra = None):
@@ -108,6 +104,8 @@
acl = None
pending = []
for id in confs:
+ if id == 'WMF':
+ continue
print('ID %s was not found' % id)
conf = confs[id]
vals = netaddr.cidr_merge([netaddr.IPNetwork(v) for v in
conf['ips']])
--
To view, visit https://gerrit.wikimedia.org/r/70244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9cb7f3bcab1f9eb7aaf400e9e8cf8ff7d3500d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
