https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113861
Revision: 113861
Author: laner
Date: 2012-03-14 21:37:56 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Bad manual merges are bad. Moving hosts assignment to proper location.
Modified Paths:
--------------
trunk/tools/subversion/user-management/manage-volumes
Modified: trunk/tools/subversion/user-management/manage-volumes
===================================================================
--- trunk/tools/subversion/user-management/manage-volumes 2012-03-14
21:31:59 UTC (rev 113860)
+++ trunk/tools/subversion/user-management/manage-volumes 2012-03-14
21:37:56 UTC (rev 113861)
@@ -60,12 +60,12 @@
project_name = project[1]["cn"][0]
hosts = []
if project_name in project_hosts:
+ hosts = project_hosts[project_name]
brick_ips = []
for brick in self.bricks:
brick_ips.append(socket.gethostbyname(brick))
hosts.extend(brick_ips)
hosts = list(set(hosts))
- hosts = project_hosts[project_name]
hosts.sort()
for volume_name in self.volume_names:
volume_hosts = hosts
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
