From c1f82dc5515a9fdafff367828e2bf90d9969f4cd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Mar 2018 18:04:10 +0100 Subject: app-portage/sisyphus : version bump --- .../sisyphus-1.1801-remove-csv-hardcode.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch (limited to 'app-portage/sisyphus/files') diff --git a/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch b/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch deleted file mode 100644 index bcbf0d87..00000000 --- a/app-portage/sisyphus/files/sisyphus-1.1801-remove-csv-hardcode.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py -index defc5cf..5944ef4 100755 ---- a/src/backend/libsisyphus.py -+++ b/src/backend/libsisyphus.py -@@ -10,15 +10,14 @@ - import sys - import time - import urllib3 -+import io - - redcore_portage_tree_path = '/usr/portage' - redcore_desktop_overlay_path = '/var/lib/layman/redcore-desktop' - redcore_portage_config_path = '/opt/redcore-build' - --sisyphus_remote_csv_url = 'http://mirror.math.princeton.edu/pub/redcorelinux/csv/remote_packages_pre.csv' - sisyphus_remote_csv_path_pre = '/var/lib/sisyphus/csv/remote_packages_pre.csv' - sisyphus_remote_csv_path_post = '/var/lib/sisyphus/csv/remote_packages_post.csv' --sisyphus_removable_csv_url = 'http://mirror.math.princeton.edu/pub/redcorelinux/csv/removable_packages_pre.csv' - sisyphus_removable_csv_path_pre = '/var/lib/sisyphus/csv/removable_packages_pre.csv' - sisyphus_removable_csv_path_post = '/var/lib/sisyphus/csv/removable_packages_post.csv' - sisyphus_local_csv_path_pre = '/var/lib/sisyphus/csv/local_packages_pre.csv' -@@ -48,6 +47,11 @@ def check_system_mode(): - sys.exit(1) - - def fetch_sisyphus_remote_packages_table_csv(): -+ portage_call = subprocess.Popen(['emerge', '--info', '--verbose'], stdout=subprocess.PIPE) -+ for portage_output in io.TextIOWrapper(portage_call.stdout, encoding="utf-8"): -+ if "PORTAGE_BINHOST" in portage_output.rstrip(): -+ sisyphus_remote_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'remote_packages_pre.csv') -+ - http = urllib3.PoolManager() - - if not os.path.isfile(sisyphus_remote_csv_path_pre): -@@ -59,6 +63,11 @@ def fetch_sisyphus_remote_packages_table_csv(): - shutil.copyfileobj(tmp_buffer, output_file) - - def fetch_sisyphus_removable_packages_table_csv(): -+ portage_call = subprocess.Popen(['emerge', '--info', '--verbose'], stdout=subprocess.PIPE) -+ for portage_output in io.TextIOWrapper(portage_call.stdout, encoding="utf-8"): -+ if "PORTAGE_BINHOST" in portage_output.rstrip(): -+ sisyphus_removable_csv_url = str(portage_output.rstrip().split("=")[1].strip('\"').replace('packages', 'csv') + 'removable_packages_pre.csv') -+ - http = urllib3.PoolManager() - - if not os.path.isfile(sisyphus_removable_csv_path_pre): -- cgit v1.2.3