summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-09-30 20:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-09-30 20:19:36 +0100
commit024c0d9e17ad0be0134bec4d673e4226984786f2 (patch)
treebcc331c99ffd4b8e9f6c33bcb3f71049b0282512
parent61a38851d8aa29e434ace62404f65f61312399d7 (diff)
app-portage/sisyphus : revision bump
-rw-r--r--app-portage/sisyphus/files/sisyphus-1.1709-r2.patch (renamed from app-portage/sisyphus/files/sisyphus-1.1709-r1.patch)14
-rw-r--r--app-portage/sisyphus/sisyphus-1.1709-r2.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1709-r1.ebuild)2
2 files changed, 6 insertions, 10 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch b/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch
index 2d70bd93..4149de01 100644
--- a/app-portage/sisyphus/files/sisyphus-1.1709-r1.patch
+++ b/app-portage/sisyphus/files/sisyphus-1.1709-r2.patch
@@ -1,15 +1,11 @@
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py
-index f49e9da..2f8e150 100755
+index f49e9da..c19bd88 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)
+@@ -258,8 +258,6 @@ def sisyphus_db_rescue():
+ 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):
diff --git a/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild b/app-portage/sisyphus/sisyphus-1.1709-r2.ebuild
index 97b61297..accff4fd 100644
--- a/app-portage/sisyphus/sisyphus-1.1709-r1.ebuild
+++ b/app-portage/sisyphus/sisyphus-1.1709-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}
src_prepare() {
default
- epatch ${FILESDIR}/${P}-r1.patch
+ epatch ${FILESDIR}/${P}-r2.patch
}
src_install() {