cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

[mirrors_config] re-enable 'pacman-mirrorlist' support

Browse Source 
- see also: https://github.com/manjaro/pamac/issues/258
- this is only needed for Archbased Distros like Antergos
This commit is contained in:
Philip 2017-05-27 10:43:23 +02:00
parent eb9cfd0aaa
commit 71edf7b773
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mirrors_config.vala
View File

@ -19,14 +19,17 @@
namespace Pamac {
class MirrorsConfig {
AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
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 {
if (pkg != "") {
string countries_str;
int status;
Process.spawn_command_line_sync ("pacman-mirrors -l",
@ -39,6 +42,16 @@ namespace Pamac {
_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);
}
@ -47,6 +60,28 @@ namespace Pamac {
}
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 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 (Error e) {
stderr.printf ("%s\n", e.message);
}
return _countries;
}
}
public MirrorsConfig (string path) {
conf_path = path;
reload ();
@ -56,6 +91,7 @@ namespace Pamac {
// set default options
choosen_generation_method = "rank";
choosen_country = "ALL";
mirrorlists_dir = "/etc/pacman.d/mirrors";
parse_file (conf_path);
}

3
src/preferences_dialog.vala
View File

@ -102,7 +102,8 @@ namespace Pamac {
transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished);
AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors");
if (pkg.name == "") {
AlpmPackage pkg_ml = transaction.find_installed_satisfier ("pacman-mirrorlist");
if (pkg.name == "" || pkg_ml.name == "") {
mirrors_config_box.visible = false;
} else {
var mirrors_config = new MirrorsConfig ("/etc/pacman-mirrors.conf");