diff options
-rw-r--r-- | app-portage/sisyphus/files/sisyphus-1.1709-r1.patch | 30 | ||||
-rw-r--r-- | app-portage/sisyphus/sisyphus-1.1709-r1.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1709.ebuild) | 5 |
2 files changed, 35 insertions, 0 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch b/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch new file mode 100644 index 00000000..2d70bd93 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch @@ -0,0 +1,30 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index f49e9da..2f8e150 100755 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -254,12 +254,6 @@ def sisyphus_pkg_sysinfo(): + subprocess.check_call(['emerge', '--info']) + + def sisyphus_db_rescue(): +- if os.path.exists(sisyphus_remote_csv_path_pre): +- os.remove(sisyphus_remote_csv_path_pre) +- if os.path.exists(sisyphus_removable_csv_path_pre): +- os.remove(sisyphus_removable_csv_path_pre) +- if os.path.exists(sisyphus_local_csv_path_pre): +- os.remove(sisyphus_local_csv_path_pre) + if os.path.exists(sisyphus_database_path): + os.remove(sisyphus_database_path) + sisyphus_pkg_system_update() +diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py +index ee90c6f..c8a8bd9 100755 +--- a/src/frontend/cli/sisyphus-cli.py ++++ b/src/frontend/cli/sisyphus-cli.py +@@ -17,7 +17,7 @@ + elif "remove-orphans" in sys.argv[1:]: + sisyphus_pkg_remove_orphans() + elif "update" in sys.argv[1:]: +- sisyphus_pkg_system_update ++ sisyphus_pkg_system_update() + elif "upgrade" in sys.argv[1:]: + sisyphus_pkg_system_upgrade() + elif "search" in sys.argv[1:]: diff --git a/app-portage/sisyphus/sisyphus-1.1709.ebuild b/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild index cbf83f20..97b61297 100644 --- a/app-portage/sisyphus/sisyphus-1.1709.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild @@ -24,6 +24,11 @@ RDEPEND="${DEPEND} sys-apps/portage[${PYTHON_USEDEP}] gui? ( dev-python/PyQt5[designer,gui,widgets,${PYTHON_USEDEP}] )" +src_prepare() { + default + epatch ${FILESDIR}/${P}-r1.patch +} + src_install() { default dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN} |