Attachment 10131 Details for Bug 33912 – возвращение логики выдачи "Done." к сстоянию до 7be75b2c

[patch] возвращение логики выдачи "Done." к сстоянию до 7be75b2c

0001-rpmpm.cc-done-with-Done.patch (text/plain), 1.57 KB, created by Michael Shigorin on 2022-01-16 15:12:22 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2022-01-16 15:12:22 MSK

Size: 1.57 KB

patch

obsolete

>From 6219ea592d23bcf1f5c4cf435f5717d187b9051e Mon Sep 17 00:00:00 2001
>From: Michael Shigorin <mike@altlinux.org>
>Date: Sun, 16 Jan 2022 14:04:14 +0300
>Subject: [PATCH] rpmpm.cc: done with Done.
>
>The behaviour change that led to "Done.\n" string output
>after each transaction by default has cripped synaptic
>making it pop up a dialog even if transaction went fine
>and there's no good reason for a proper Unix program
>to bother its master.
>
>Let's just revert to sanity here; note that it's not
>the complete fix as librpm outputs NEVRA now and those
>lines constitute the still-popping-up annoyance in
>synaptic.
>
>Fixes: 7be75b2c020b8ff851339bcc805481343c8dc285
>See-also: http://bugzilla.altlinux.org/33912
>See-also: http://wagner.pp.ru/~vitus/articles/user-friendly.html
>---
> apt-pkg/rpm/rpmpm.cc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/apt-pkg/rpm/rpmpm.cc b/apt-pkg/rpm/rpmpm.cc
>index f3ea51e..2c069da 100644
>--- a/apt-pkg/rpm/rpmpm.cc
>+++ b/apt-pkg/rpm/rpmpm.cc
>@@ -679,7 +679,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, const std::vector<apt_item> &files)
>       return _error->Error(_("Sub-process %s exited unexpectedly"),Args[0]);
>    }
> 
>-   if (quiet <= 2)
>+   if (Interactive == true)
>       cout << _("Done.") << endl;
> 
>    return true;
>@@ -1006,7 +1006,7 @@ bool pkgRPMLibPM::Process(const std::vector<apt_item> &install,
>       _error->Error(_("Some errors occurred while running transaction"));
>    } else {
>       Success = true;
>-      if (quiet <= 2)
>+      if (Interactive == true)
> 	 cout << _("Done.") << endl;
>    }
>    rpmpsFree(probs);
>-- 
>2.33.0
>

Actions: View | Diff

Attachments on bug 33912: 10131