diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 20:57:46 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-21 20:57:46 +0100 |
| commit | e785ec03f72ca5bef4514f7adfe446f9c7a0e959 (patch) | |
| tree | 5d602d10ef37748e9bdc057ac4e7e03fa92eced7 | |
| parent | 51f1aa99651c21eafd0e139aa753cba46a58a378 (diff) | |
app-portage/sisyphus : revision bump
| -rw-r--r-- | app-portage/sisyphus/files/sisyphus-1.1710-r1.patch | 46 | ||||
| -rw-r--r-- | app-portage/sisyphus/sisyphus-1.1710-r1.ebuild (renamed from app-portage/sisyphus/sisyphus-1.1710.ebuild) | 5 |
2 files changed, 51 insertions, 0 deletions
diff --git a/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch b/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch new file mode 100644 index 00000000..716ac971 --- /dev/null +++ b/app-portage/sisyphus/files/sisyphus-1.1710-r1.patch @@ -0,0 +1,46 @@ +diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py +index 5f62119..4f7fda5 100755 +--- a/src/backend/libsisyphus.py ++++ b/src/backend/libsisyphus.py +@@ -112,10 +112,24 @@ def sync_sisyphus_database_removable_packages_table(): + @animation.wait('syncing remote databases') + def redcore_sync(): + check_if_root() +- sync_redcore_portage_tree_and_desktop_overlay() +- sync_redcore_portage_config() +- sync_sisyphus_database_remote_packages_table() +- sync_sisyphus_database_removable_packages_table() ++ ++ fetch_sisyphus_remote_packages_table_csv() ++ if filecmp.cmp(sisyphus_remote_csv_path_pre, sisyphus_remote_csv_path_post): ++ os.remove(sisyphus_remote_csv_path_post) ++ else: ++ sync_redcore_portage_tree_and_desktop_overlay() ++ sync_redcore_portage_config() ++ sync_sisyphus_database_remote_packages_table() ++ sync_sisyphus_database_removable_packages_table() ++ ++ fetch_sisyphus_removable_packages_table_csv() ++ if filecmp.cmp(sisyphus_removable_csv_path_pre, sisyphus_removable_csv_path_post): ++ os.remove(sisyphus_removable_csv_path_post) ++ else: ++ sync_redcore_portage_tree_and_desktop_overlay() ++ sync_redcore_portage_config() ++ sync_sisyphus_database_remote_packages_table() ++ sync_sisyphus_database_removable_packages_table() + + def generate_sisyphus_local_packages_table_csv_pre(): + subprocess.check_call(['/usr/share/sisyphus/helpers/make_local_csv_pre']) # this is really hard to do in python, so we cheat with a bash helper script +diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py +index d64f431..027c90c 100755 +--- a/src/frontend/gui/sisyphus-gui.py ++++ b/src/frontend/gui/sisyphus-gui.py +@@ -172,7 +172,7 @@ def loadDatabase(self): + AND i.name = a.name + AND i.slot = a.slot + WHERE %s LIKE %s %s +- AND a.timestamp <> i.timestamp ++ AND a.timestamp > i.timestamp + ''' % (Sisyphus.SEARCHFIELD, Sisyphus.SEARCHTERM, FILTEROUT)), + ]) + with sqlite3.connect(sisyphus_database_path) as db: diff --git a/app-portage/sisyphus/sisyphus-1.1710.ebuild b/app-portage/sisyphus/sisyphus-1.1710-r1.ebuild index cbf83f20..31bb18fd 100644 --- a/app-portage/sisyphus/sisyphus-1.1710.ebuild +++ b/app-portage/sisyphus/sisyphus-1.1710-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 + eapply ${FILESDIR}/${P}-r1.patch +} + src_install() { default dosym /usr/share/${PN}/${PN}-cli.py /usr/bin/${PN} |