From 57acdc25f38bd37d9e4fe9c1890e22e2edef9915 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sat, 27 May 2017 12:48:09 +0200
Subject: [PATCH] [mirrors_config] revert made changes - there is no official
 way to automatically filter mirrors by country and/or rank them in ArchLinux.
 - this function was always exclusive to Manjaro and therefore useless for
 Arch - there no reason to make the tab appears in Archlinux except if we add
 support for another tool like reflector.

---
 src/mirrors_config.vala     | 29 ++++++++---------------------
 src/preferences_dialog.vala |  3 +--
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/mirrors_config.vala b/src/mirrors_config.vala
index f1887ac..b09c9c6 100644
--- a/src/mirrors_config.vala
+++ b/src/mirrors_config.vala
@@ -22,35 +22,22 @@ namespace Pamac {
 		string conf_path;
 		GLib.List<string> _countries ;
 
-		public string mirrorlists_dir { get; private set; }
 		public string choosen_generation_method { get; private set; }
 		public string choosen_country { get; private set; }
 		public unowned GLib.List<string> countries {
 			get {
 				try {
-					var file = File.new_for_path ("/usr/bin/pacman-mirrors");
-					if (file.query_exists ()) {
-						string countries_str;
-						int status;
-						Process.spawn_command_line_sync ("pacman-mirrors -l",
+					string countries_str;
+					int status;
+					Process.spawn_command_line_sync ("pacman-mirrors -l",
 												out countries_str,
 												null,
 												out status);
-						_countries = new GLib.List<string> ();
-						if (status == 0) {
-							foreach (unowned string country in countries_str.split ("\n")) {
-							_countries.append (country);
-							}
+					_countries = new GLib.List<string> ();
+					if (status == 0) {
+						foreach (unowned string country in countries_str.split ("\n")) {
+						_countries.append (country);
 						}
-					} else {
-						var directory = GLib.File.new_for_path (mirrorlists_dir);
-						var enumerator = directory.enumerate_children (FileAttribute.STANDARD_NAME, 0);
-						FileInfo file_info;
-						_countries = new GLib.List<string> ();
-						while ((file_info = enumerator.next_file ()) != null) {
-							_countries.append(file_info.get_name ());
-						}
-						_countries.sort (strcmp);
 					}
 				} catch (SpawnError e) {
 					stdout.printf ("Error: %s\n", e.message);
@@ -59,6 +46,7 @@ namespace Pamac {
 			}
 		}
 
+
 		public MirrorsConfig (string path) {
 			conf_path = path;
 			reload ();
@@ -68,7 +56,6 @@ namespace Pamac {
 			// set default options
 			choosen_generation_method = "rank";
 			choosen_country = "ALL";
-			mirrorlists_dir = "/etc/pacman.d/mirrors";
 			parse_file (conf_path);
 		}
 
diff --git a/src/preferences_dialog.vala b/src/preferences_dialog.vala
index 45f8805..8bf338d 100644
--- a/src/preferences_dialog.vala
+++ b/src/preferences_dialog.vala
@@ -102,8 +102,7 @@ namespace Pamac {
 			transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished);
 
 			AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
-			AlpmPackage pkg_ml = transaction.find_installed_satisfier ("pacman-mirrorlist");
-			if (pkg.name == "" || pkg_ml.name == "") {
+			if (pkg.name == "") {
 				mirrors_config_box.visible = false;
 			} else {
 				var mirrors_config = new MirrorsConfig ("/etc/pacman-mirrors.conf");