summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/__init__.py2
-rw-r--r--src/backend/dlpkg.py (renamed from src/backend/download.py)0
-rw-r--r--src/backend/install.py10
-rw-r--r--src/backend/upgrade.py10
4 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index d6dc4c7..ccfb27a 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -1,6 +1,6 @@
from .autoremove import *
from .checkenv import *
-from .download import *
+from .dlpkg import *
from .getcolor import *
from .getenv import *
from .getfs import *
diff --git a/src/backend/download.py b/src/backend/dlpkg.py
index ce089ad..ce089ad 100644
--- a/src/backend/download.py
+++ b/src/backend/dlpkg.py
diff --git a/src/backend/install.py b/src/backend/install.py
index 6527a48..5e9b3b8 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -9,7 +9,7 @@ import subprocess
import sys
import time
import sisyphus.checkenv
-import sisyphus.download
+import sisyphus.dlpkg
import sisyphus.getcolor
import sisyphus.getfs
import sisyphus.killemerge
@@ -140,7 +140,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(dl_world=False, gfx_ui=False)
+ sisyphus.dlpkg.start(dl_world=False, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y',
'--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
@@ -172,7 +172,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(dl_world=False, gfx_ui=False)
+ sisyphus.dlpkg.start(dl_world=False, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
'--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + (['--oneshot'] if oneshot else []) + list(pkgname))
@@ -234,7 +234,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
"\n" + "These are the binary packages that will be merged, in order:" + "\n")
print("\n" + ", ".join(bin_list) + "\n\n" + "Total:" + " " +
str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
- sisyphus.download.start(dl_world=False, gfx_ui=True)
+ sisyphus.dlpkg.start(dl_world=False, gfx_ui=True)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y',
'--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -257,7 +257,7 @@ def start(pkgname, ebuild=False, gfx_ui=False, oneshot=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(
+ sisyphus.dlpkg.start(
dl_world=False, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index 712bec0..cec6061 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -9,7 +9,7 @@ import subprocess
import sys
import time
import sisyphus.checkenv
-import sisyphus.download
+import sisyphus.dlpkg
import sisyphus.getcolor
import sisyphus.getfs
import sisyphus.killemerge
@@ -126,7 +126,7 @@ def start(ebuild=False, gfx_ui=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(dl_world=True, gfx_ui=False)
+ sisyphus.dlpkg.start(dl_world=True, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg',
'--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
@@ -158,7 +158,7 @@ def start(ebuild=False, gfx_ui=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(dl_world=True, gfx_ui=False)
+ sisyphus.dlpkg.start(dl_world=True, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',
'--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
@@ -220,7 +220,7 @@ def start(ebuild=False, gfx_ui=False):
"\n" + "These are the binary packages that will be merged, in order:" + "\n")
print("\n" + ", ".join(bin_list) + "\n\n" + "Total:" + " " +
str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
- sisyphus.download.start(dl_world=True, gfx_ui=True)
+ sisyphus.dlpkg.start(dl_world=True, gfx_ui=True)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries',
'--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -243,7 +243,7 @@ def start(ebuild=False, gfx_ui=False):
user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " +
"[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ")
if user_input.lower() in ['yes', 'y', '']:
- sisyphus.download.start(
+ sisyphus.dlpkg.start(
dl_world=True, gfx_ui=False)
os.chdir(sisyphus.getfs.p_cch_dir)
p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly',