From b741ff730128eca27c70ebc591a67ace44bff1db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Mar 2019 11:59:08 +0000 Subject: make syncing more robust, rely on git, not emerge --- src/frontend/gui/sisyphus-gui.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/frontend/gui/sisyphus-gui.py') 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')) -- cgit v1.2.3