fix error in logic from previous commit

Antergos · Jun 14, 2016 · c38a136 · c38a136
1 parent 67a7457
commit c38a136
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,4 @@
+[2016-06-14 00:35:42 -0500]  exclude sourceforge geo redirector from mirrorlist (again :grimacin..  Dustin Falgout  {67a7457}
 [2016-06-13 23:45:32 -0500]  use install id as user name in bugsnag so we can easily locate logs..  Dustin Falgout  {129fbbd}
 [2016-06-13 22:57:15 -0500]  remove patch for install failures related to cinnamon as it was dum..  Dustin Falgout  {301aa75}
 [2016-06-06 22:50:13 +0200]  Merge pull request #611 from Wyn10/patch-2                                 karasu      {44ccd43}

diff --git a/cnchi/info.py b/cnchi/info.py
@@ -29,7 +29,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "0.14.103"
+CNCHI_VERSION = "0.14.104"
 CNCHI_WEBSITE = "http://www.antergos.com"
 CNCHI_RELEASE_STAGE = "production"
 

diff --git a/cnchi/rank_mirrors.py b/cnchi/rank_mirrors.py
@@ -241,15 +241,18 @@ def uncomment_antergos_mirrors(self):
                 lines = [x.strip() for x in mirrors.readlines()]
 
             for i in range(len(lines)):
-                if autoselect_on and lines[i].startswith("Server") and autoselect in lines[i]:
+                srv_comment = lines[i].startswith("#Server")
+                srv = lines[i].startswith("Server")
+
+                if autoselect_on and srv and autoselect in lines[i]:
                     # Comment out auto selection
                     lines[i] = "#" + lines[i]
                     autoselect_on = False
-                elif autoselect_sf and lines[i].startswith("Server") and 'sourceforge' in lines[i]:
+                elif autoselect_sf and srv and 'sourceforge' in lines[i]:
                     # Comment out sourceforge auto selection url
                     lines[i] = "#" + lines[i]
                     autoselect_sf = False
-                elif lines[i].startswith("#Server") and autoselect not in lines[i]:
+                elif srv_comment and autoselect not in lines[i] and 'sourceforge' not in lines[i]:
                     # Uncomment Antergos mirror
                     lines[i] = lines[i].lstrip("#")
 

diff --git a/update.info b/update.info
@@ -1,2 +1,2 @@
-{"version":"0.14.103","files":[
+{"version":"0.14.104","files":[
 ]}