diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-09 04:10:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-09 04:10:15 +0000 |
| commit | 48775bb7bb51674c03707774b7073373ab270107 (patch) | |
| tree | 1d0ac2a290f6fbf2bdd6c5ec49135776efe741bd /src/backend/installebuild.py | |
| parent | 3d811e9ab090d955af5dc6641896656a5e517069 (diff) | |
* use .join rather than str to convert lists to strings
* fix output message when multiple source packages are requested
* minor UI tweaks
Diffstat (limited to 'src/backend/installebuild.py')
| -rw-r--r-- | src/backend/installebuild.py | 8 |
1 files changed, 4 insertions, 4 deletions
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) |