summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/installbinary.py4
-rw-r--r--src/backend/installebuild.py8
-rw-r--r--src/backend/upgradebinary.py2
-rw-r--r--src/backend/upgradeebuild.py8
4 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/installbinary.py b/src/backend/installbinary.py
index d762ef9..9658bf9 100644
--- a/src/backend/installbinary.py
+++ b/src/backend/installbinary.py
@@ -24,7 +24,7 @@ def start(pkgname):
if len(areSources) == 0:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
@@ -60,6 +60,6 @@ def start(pkgname):
else:
sys.exit("\n" + "No package found; Quitting." + "\n")
else:
- sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + ''.join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
+ sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + " ".join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
else:
sys.exit("\nYou need root permissions to do this, exiting!\n")
diff --git a/src/backend/installebuild.py b/src/backend/installebuild.py
index 62e7fc2..27062bf 100644
--- a/src/backend/installebuild.py
+++ b/src/backend/installebuild.py
@@ -24,7 +24,7 @@ def start(pkgname):
if len(areSources) == 0:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
@@ -62,8 +62,8 @@ def start(pkgname):
else:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
- print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
@@ -97,7 +97,7 @@ def start(pkgname):
else:
sys.exit("\n" + "Ok; Quitting." + "\n")
else:
- print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
+ print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
portageExec = subprocess.Popen(['emerge', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE)
diff --git a/src/backend/upgradebinary.py b/src/backend/upgradebinary.py
index b3d68b6..2bb7905 100644
--- a/src/backend/upgradebinary.py
+++ b/src/backend/upgradebinary.py
@@ -24,7 +24,7 @@ def start():
if len(areSources) == 0:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
diff --git a/src/backend/upgradeebuild.py b/src/backend/upgradeebuild.py
index 952bde7..21add70 100644
--- a/src/backend/upgradeebuild.py
+++ b/src/backend/upgradeebuild.py
@@ -24,7 +24,7 @@ def start():
if len(areSources) == 0:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
@@ -62,8 +62,8 @@ def start():
else:
if not len(areBinaries) == 0:
os.chdir(sisyphus.filesystem.portageCacheDir)
- print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + str(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
- print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
+ print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
+ print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
for index, binary in enumerate([package + '.tbz2' for package in areBinaries]):
print(">>> Fetching" + " " + binhostURL + binary)
@@ -97,7 +97,7 @@ def start():
else:
sys.exit("\n" + "Ok; Quitting." + "\n")
else:
- print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + str(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
+ print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
portageExec = subprocess.Popen(['emerge', '--update', '--deep', '--newuse', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE)