diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-10-27 02:46:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-27 02:46:36 +0100 |
| commit | 4b1f4edf874da9620d2960c7b1a5c36da330ec7a (patch) | |
| tree | 7bd69d11100859c7882df458fabba8bf1e1099e3 /src/backend/installPkg.py | |
| parent | 6b567b80c45c1f03c71e59cb4eb370fa331e038e (diff) | |
bugfix : https://bugs.redcorelinux.org/show_bug.cgi?id=131
Diffstat (limited to 'src/backend/installPkg.py')
| -rw-r--r-- | src/backend/installPkg.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py index 9aa9b51..2a4f53d 100644 --- a/src/backend/installPkg.py +++ b/src/backend/installPkg.py @@ -42,11 +42,7 @@ def cliExec(pkgname): if os.path.exists(binary.rstrip().split("/")[1]): os.remove(binary.rstrip().split("/")[1]) - portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - print(portageOutput.rstrip()) + portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) portageExec.wait() sisyphus.syncDatabase.localTable() @@ -82,14 +78,12 @@ def guiExec(pkgname): if os.path.exists(binary.rstrip().split("/")[1]): os.remove(binary.rstrip().split("/")[1]) - portageExec = subprocess.Popen(['emerge', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + portageExec = 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) # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killPortage.cliExec, portageExec) for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): - if not "These are the packages that would be merged, in order:" in portageOutput.rstrip(): - if not "Calculating dependencies" in portageOutput.rstrip(): - print(portageOutput.rstrip()) + print(portageOutput.rstrip()) portageExec.wait() sisyphus.syncDatabase.localTable() |