jenkins-bot has submitted this change and it was merged.

Change subject: Allow hyphen (-) in dsh hostnames
......................................................................


Allow hyphen (-) in dsh hostnames

Names such as "deployment-apache01.eqiad.wmflabs" are valid hostnames.

Change-Id: Ia3c6b0b617766ca345e0295caadfdd32b5963109
---
M scap/utils.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scap/utils.py b/scap/utils.py
index b1aafed..152d534 100644
--- a/scap/utils.py
+++ b/scap/utils.py
@@ -23,7 +23,7 @@
     """
     try:
         with open(os.path.join('/etc/dsh/group', path)) as hosts_file:
-            return re.findall(r'^[\w\.]+', hosts_file.read(), re.MULTILINE)
+            return re.findall(r'^[\w\.\-]+', hosts_file.read(), re.MULTILINE)
     except IOError, e:
         raise IOError(e.errno, e.strerror, path)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3c6b0b617766ca345e0295caadfdd32b5963109
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to