sisyphus-backend : add rescue option, to reinit a lost or corrupted db; fix a widespread typo

2 files changed, 5 insertions, 3 deletions

diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index c6d3e3c..ee90c6f 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -16,14 +16,16 @@ if "__main__" == __name__:
         sisyphus_pkg_force_uninstall(PKGLIST)
     elif "remove-orphans" in sys.argv[1:]:
         sisyphus_pkg_remove_orphans()
+    elif "update" in sys.argv[1:]:
+        sisyphus_pkg_system_update
     elif "upgrade" in sys.argv[1:]:
         sisyphus_pkg_system_upgrade()
     elif "search" in sys.argv[1:]:
         sisyphus_pkg_search(PKGLIST)
-    elif "update" in sys.argv[1:]:
-        sisyphus_pkg_system_update()
     elif "spmsync" in sys.argv[1:]:
         sisyphus_pkg_spmsync()
+    elif "rescue" in sys.argv[1:]:
+        sisyphus_db_rescue()
     elif "sysinfo" in sys.argv[1:]:
         sisyphus_pkg_sysinfo()
     elif "help" in sys.argv[1:]:
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 45b1380..10321ba 100755
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -106,7 +106,7 @@ class Sisyphus(QtWidgets.QMainWindow):
                             ON a.category = i.category
                             AND a.name = i.name
                             AND a.slot = i.slot
-                            LEFT JOIN removeable_packages as rm
+                            LEFT JOIN removable_packages as rm
                             ON i.category = rm.category
                             AND i.name = rm.name
                             AND i.slot = rm.slot