diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-21 11:59:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-21 11:59:08 +0000 |
| commit | b741ff730128eca27c70ebc591a67ace44bff1db (patch) | |
| tree | 79375e52c108d535cc794df328896e834ba614fa /src/frontend | |
| parent | 42df0bc391b29cd42dff591c7e6cbe08558ae29c (diff) | |
make syncing more robust, rely on git, not emerge
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/gui/sisyphus-gui.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py index 7d88fa6..9a8a87e 100644 --- a/src/frontend/gui/sisyphus-gui.py +++ b/src/frontend/gui/sisyphus-gui.py @@ -369,7 +369,7 @@ class MainWorker(QtCore.QObject): areBinaries,areSources,needsConfig = getPackageDeps(pkgList) binaryPkgs = [] - os.chdir(portageCache) + os.chdir(portageCacheDir) for index, url in enumerate([binhostURL + package + '.tbz2' for package in areBinaries]): self.strReady.emit(">>> Fetching" + " " + url) print(">>> Fetching" + " " + url) @@ -385,11 +385,11 @@ class MainWorker(QtCore.QObject): CATEGORY = subprocess.check_output(['qxpak', '-x', '-O'] + str(binpkg + '.xpak').split() + ['CATEGORY']) os.remove(str(binpkg + '.xpak')) - if os.path.isdir(portageCache + CATEGORY.decode().strip()): - shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCache + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) + if os.path.isdir(portageCacheDir + CATEGORY.decode().strip()): + shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCacheDir + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) else: - os.makedirs(portageCache + CATEGORY.decode().strip()) - shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCache + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) + os.makedirs(portageCacheDir + CATEGORY.decode().strip()) + shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCacheDir + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) if os.path.exists(str(binpkg + '.tbz2')): os.remove(str(binpkg + '.tbz2')) @@ -430,7 +430,7 @@ class MainWorker(QtCore.QObject): areBinaries,areSources,needsConfig = getWorldDeps() binaryPkgs = [] - os.chdir(portageCache) + os.chdir(portageCacheDir) for index, url in enumerate([binhostURL + package + '.tbz2' for package in areBinaries]): self.strReady.emit(">>> Fetching" + " " + url) print(">>> Fetching" + " " + url) @@ -446,11 +446,11 @@ class MainWorker(QtCore.QObject): CATEGORY = subprocess.check_output(['qxpak', '-x', '-O'] + str(binpkg + '.xpak').split() + ['CATEGORY']) os.remove(str(binpkg + '.xpak')) - if os.path.isdir(portageCache + CATEGORY.decode().strip()): - shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCache + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) + if os.path.isdir(portageCacheDir + CATEGORY.decode().strip()): + shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCacheDir + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) else: - os.makedirs(portageCache + CATEGORY.decode().strip()) - shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCache + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) + os.makedirs(portageCacheDir + CATEGORY.decode().strip()) + shutil.move(str(binpkg + '.tbz2'), os.path.join(portageCacheDir + CATEGORY.decode().strip(), os.path.basename(str(binpkg + '.tbz2')))) if os.path.exists(str(binpkg + '.tbz2')): os.remove(str(binpkg + '.tbz2')) |