diff options
| -rw-r--r-- | src/backend/__init__.py | 2 | ||||
| -rw-r--r-- | src/backend/installpkg.py | 4 | ||||
| -rw-r--r-- | src/backend/installsrc.py | 4 | ||||
| -rw-r--r-- | src/backend/searchpkg.py | 4 | ||||
| -rw-r--r-- | src/backend/update.py (renamed from src/backend/updateAll.py) | 0 | ||||
| -rw-r--r-- | src/backend/upgradePkg.py | 4 | ||||
| -rw-r--r-- | src/backend/upgradeSrc.py | 4 | ||||
| -rwxr-xr-x | src/frontend/cli/sisyphus-cli.py | 2 | ||||
| -rw-r--r-- | src/frontend/gui/sisyphus-gui.py | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py index 371de60..dd96de9 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -19,6 +19,6 @@ from .syncenv import * from .syncspm import * from .sysinfo import * from .uninstall import * -from .updateAll import * +from .update import * from .upgradePkg import * from .upgradeSrc import * diff --git a/src/backend/installpkg.py b/src/backend/installpkg.py index 1a27051..0661831 100644 --- a/src/backend/installpkg.py +++ b/src/backend/installpkg.py @@ -13,11 +13,11 @@ import sisyphus.getfs import sisyphus.killemerge import sisyphus.solvedeps import sisyphus.syncdb -import sisyphus.updateAll +import sisyphus.update def cliExec(pkgname): if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname) diff --git a/src/backend/installsrc.py b/src/backend/installsrc.py index 9b88974..374a215 100644 --- a/src/backend/installsrc.py +++ b/src/backend/installsrc.py @@ -11,11 +11,11 @@ import sisyphus.getenv import sisyphus.getfs import sisyphus.solvedeps import sisyphus.syncdb -import sisyphus.updateAll +import sisyphus.update def cliExec(pkgname): if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname) diff --git a/src/backend/searchpkg.py b/src/backend/searchpkg.py index df62001..e0c33c6 100644 --- a/src/backend/searchpkg.py +++ b/src/backend/searchpkg.py @@ -3,7 +3,7 @@ import sqlite3 import sisyphus.checkenv import sisyphus.getfs -import sisyphus.updateAll +import sisyphus.update def searchDB(filter, cat = '', pn = '', desc = ''): NOVIRT = "AND cat NOT LIKE 'virtual'" @@ -126,7 +126,7 @@ def showSearch(filter, cat, pn, desc, single): def cliExec(filter, cat, pn, desc, single): if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() else: print("\nYou are not root, cannot fetch updates.\nSearch result may be inaccurate!\n") diff --git a/src/backend/updateAll.py b/src/backend/update.py index 5a6a6cd..5a6a6cd 100644 --- a/src/backend/updateAll.py +++ b/src/backend/update.py diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index eea69a9..b4db8f5 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -13,11 +13,11 @@ import sisyphus.getfs import sisyphus.killemerge import sisyphus.solvedeps import sisyphus.syncdb -import sisyphus.updateAll +import sisyphus.update def cliExec(): if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.solvedeps.world() diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index 481fd83..0ad66c8 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -11,11 +11,11 @@ import sisyphus.getenv import sisyphus.getfs import sisyphus.solvedeps import sisyphus.syncdb -import sisyphus.updateAll +import sisyphus.update def cliExec(): if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.solvedeps.world() diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index c97dd3b..18b4c0b 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -178,7 +178,7 @@ def autoremove(): def update(): """Update the Portage tree, the Redcore Overlay(s), Portage configs and Sisyphus's package database.""" if sisyphus.checkenv.root(): - sisyphus.updateAll.cliExec() + sisyphus.update.cliExec() else: sys.exit("\nYou need root permissions to do this, exiting!\n") diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index e33c3be..9ce1436 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -391,7 +391,7 @@ class MainWorker(QtCore.QObject): def startUpdate(self): self.started.emit() sisyphus.setjobs.cliExec() - sisyphus.updateAll.guiExec() + sisyphus.update.guiExec() self.finished.emit() @QtCore.pyqtSlot() |