diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-02 15:51:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-02 15:51:57 +0100 |
| commit | 55ab0d11545c1f04f67236f3c741b1214acce050 (patch) | |
| tree | 08c0b8ae5602d986069e6291ff7eb74a534ad64e /src/backend | |
| parent | 14958420f5ef90ae265dd89889f0bc2009f1618d (diff) | |
more backend bugfixes: drop some redundant code, rework update and make sure we're always syncedv2.1904.0
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/libsisyphus.py | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index d5eece3..e64bd11 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -182,7 +182,7 @@ def syncPortageCfg(): subprocess.call(['git', 'pull', '--quiet']) @animation.wait('syncing remote database') -def syncAll(): +def startUpdate(): checkRoot() syncPortageTree() syncPortageCfg() @@ -192,11 +192,6 @@ def syncAll(): def startSyncSPM(): syncLocalDatabase() -@animation.wait('syncing portage') -def startSync(): - syncPortageTree() - syncPortageCfg() - @animation.wait('resurrecting database') def rescueDB(): if os.path.exists(remotePkgsDB): @@ -217,11 +212,8 @@ def startSearch(pkgList): def startHybridSearch(pkgList): subprocess.check_call(['emerge', '--search', '--getbinpkg'] + pkgList) -def startUpdate(): - syncAll() - def startInstall(pkgList): - syncAll() + startUpdate() binhostURL = getBinhostURL() areBinaries,areSources,needsConfig = getPackageDeps(pkgList) @@ -272,7 +264,7 @@ def startInstall(pkgList): sys.exit("\n" + "No binary package found; Source package found; Use sisyphus --hybrid-install; Quitting." + "\n") def startHybridInstall(pkgList): - syncAll() + startUpdate() binhostURL = getBinhostURL() areBinaries,areSources,needsConfig = getPackageDeps(pkgList) @@ -387,7 +379,7 @@ def startHybridInstall(pkgList): sys.exit("\n" + "Cannot proceed; Apply the above changes to your portage configuration files and try again; Quitting." + "\n") def startUpgrade(): - syncAll() + startUpdate() binhostURL = getBinhostURL() areBinaries,areSources,needsConfig = getWorldDeps() @@ -438,7 +430,7 @@ def startUpgrade(): sys.exit("\n" + "No binary package upgrades found; Source package upgrades found; Use sisyphus --hybrid-upgrade; Quitting." + "\n") def startHybridUpgrade(): - syncAll() + startUpdate() binhostURL = getBinhostURL() areBinaries,areSources,needsConfig = getWorldDeps() |