diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/__init__.py | 2 | ||||
-rw-r--r-- | src/backend/checkenv.py (renamed from src/backend/checkEnvironment.py) | 4 | ||||
-rw-r--r-- | src/backend/getenv.py (renamed from src/backend/getEnvironment.py) | 0 | ||||
-rw-r--r-- | src/backend/installPkg.py | 6 | ||||
-rw-r--r-- | src/backend/installSrc.py | 4 | ||||
-rw-r--r-- | src/backend/syncDatabase.py | 4 | ||||
-rw-r--r-- | src/backend/updateAll.py | 6 | ||||
-rw-r--r-- | src/backend/upgradePkg.py | 6 | ||||
-rw-r--r-- | src/backend/upgradeSrc.py | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py index 20b12a0..02c5bf2 100644 --- a/src/backend/__init__.py +++ b/src/backend/__init__.py @@ -1,6 +1,6 @@ from .autoremove import * from .checkenv import * -from .getEnvironment import * +from .getenv import * from .getFilesystem import * from .installPkg import * from .installSrc import * diff --git a/src/backend/checkEnvironment.py b/src/backend/checkenv.py index 9613fe6..feaab4b 100644 --- a/src/backend/checkEnvironment.py +++ b/src/backend/checkenv.py @@ -2,7 +2,7 @@ import os import subprocess -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem def root(): @@ -25,7 +25,7 @@ def branch(): def sanity(): activeBranch = branch() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() isSane = int() if "packages-next" in binhostURL: diff --git a/src/backend/getEnvironment.py b/src/backend/getenv.py index 5edd038..5edd038 100644 --- a/src/backend/getEnvironment.py +++ b/src/backend/getenv.py diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py index 55e9bb7..7c1f100 100644 --- a/src/backend/installPkg.py +++ b/src/backend/installPkg.py @@ -8,7 +8,7 @@ import subprocess import sys import wget import sisyphus.checkenv -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem import sisyphus.killPortage import sisyphus.resolveDeps @@ -19,7 +19,7 @@ def cliExec(pkgname): if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package(pkgname) if needsConfig == 0: @@ -59,7 +59,7 @@ def cliExec(pkgname): sys.exit("\nYou need root permissions to do this, exiting!\n") def guiExec(pkgname): - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package.__wrapped__(pkgname) #undecorate os.chdir(sisyphus.getFilesystem.portageCacheDir) diff --git a/src/backend/installSrc.py b/src/backend/installSrc.py index 8929041..d37399e 100644 --- a/src/backend/installSrc.py +++ b/src/backend/installSrc.py @@ -7,7 +7,7 @@ import subprocess import sys import wget import sisyphus.checkenv -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem import sisyphus.resolveDeps import sisyphus.syncDatabase @@ -17,7 +17,7 @@ def cliExec(pkgname): if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package(pkgname) if needsConfig == 0: diff --git a/src/backend/syncDatabase.py b/src/backend/syncDatabase.py index 1823847..760e3b6 100644 --- a/src/backend/syncDatabase.py +++ b/src/backend/syncDatabase.py @@ -5,11 +5,11 @@ import shutil import urllib3 import sqlite3 import subprocess -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem def remoteCSV(): - packagesCsvURL,descriptionsCsvURL = sisyphus.getEnvironment.csvURL() + packagesCsvURL,descriptionsCsvURL = sisyphus.getenv.csvURL() http = urllib3.PoolManager() with http.request('GET', packagesCsvURL, preload_content=False) as tmp_buffer, open(sisyphus.getFilesystem.remotePackagesCsv, 'wb') as output_file: diff --git a/src/backend/updateAll.py b/src/backend/updateAll.py index ed6a6cc..bf95266 100644 --- a/src/backend/updateAll.py +++ b/src/backend/updateAll.py @@ -4,7 +4,7 @@ import animation import sys import time import sisyphus.checkenv -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.purgeEnvironment import sisyphus.syncDatabase import sisyphus.syncEnvironment @@ -19,7 +19,7 @@ def syncAll(): @animation.wait('fetching updates') def cliExec(): activeBranch = sisyphus.checkenv.branch() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() isSane = sisyphus.checkenv.sanity() if isSane == 1: @@ -33,7 +33,7 @@ def cliExec(): def guiExec(): activeBranch = sisyphus.checkenv.branch() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() isSane = sisyphus.checkenv.sanity() if isSane == 1: diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py index ec46cda..5110499 100644 --- a/src/backend/upgradePkg.py +++ b/src/backend/upgradePkg.py @@ -8,7 +8,7 @@ import subprocess import sys import wget import sisyphus.checkenv -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem import sisyphus.killPortage import sisyphus.resolveDeps @@ -19,7 +19,7 @@ def cliExec(): if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world() if needsConfig == 0: @@ -59,7 +59,7 @@ def cliExec(): sys.exit("\nYou need root permissions to do this, exiting!\n") def guiExec(): - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world.__wrapped__() #undecorate if not len(areSources) == 0: diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py index 3335724..7251e64 100644 --- a/src/backend/upgradeSrc.py +++ b/src/backend/upgradeSrc.py @@ -7,7 +7,7 @@ import subprocess import sys import wget import sisyphus.checkenv -import sisyphus.getEnvironment +import sisyphus.getenv import sisyphus.getFilesystem import sisyphus.resolveDeps import sisyphus.syncDatabase @@ -17,7 +17,7 @@ def cliExec(): if sisyphus.checkenv.root(): sisyphus.updateAll.cliExec() - binhostURL = sisyphus.getEnvironment.binhostURL() + binhostURL = sisyphus.getenv.binhostURL() areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world() if needsConfig == 0: |