commit: 20844dc943700cca72bbb6896f42adcd30de41e3
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 08:13:29 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 2 08:45:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=20844dc9
qlop: silently drop -l when -d is used with -E
While -E defaults to -l (last merge), silently drop it when -d is used.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
man/qlop.1 | 4 ++--
qlop.c | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/man/qlop.1 b/man/qlop.1
index 1b63edd..7027f14 100644
--- a/man/qlop.1
+++ b/man/qlop.1
@@ -1,5 +1,5 @@
.\" generated by mkman.py, please do NOT edit!
-.TH qlop "1" "Nov 2019" "Gentoo Foundation" "qlop"
+.TH qlop "1" "May 2020" "Gentoo Foundation" "qlop"
.SH NAME
qlop \- emerge log analyzer
.SH SYNOPSIS
@@ -66,7 +66,7 @@ Show autoclean unmerge history.
Show sync history.
.TP
\fB\-E\fR, \fB\-\-emerge\fR
-Show last merge like how emerge(1) -v would show it.
+Show last merge similar to how emerge(1) -v would show it.
.TP
\fB\-e\fR, \fB\-\-endtime\fR
Report time at which the operation finished (iso started).
diff --git a/qlop.c b/qlop.c
index cbe3b58..3e38adf 100644
--- a/qlop.c
+++ b/qlop.c
@@ -58,7 +58,7 @@ static const char * const qlop_opts_help[] = {
"Show unmerge history",
"Show autoclean unmerge history",
"Show sync history",
- "Show last merge like how emerge(1) -v would show it",
+ "Show last merge similar to how emerge(1) -v would show it",
"Report time at which the operation finished (iso started)",
"Show current emerging packages",
"Limit selection to this time (1st -d is start, 2nd -d is end)",
@@ -1367,7 +1367,8 @@ int qlop_main(int argc, char **argv)
/* handle -l / -d conflict */
if (start_time != 0 && m.show_lastmerge) {
- warn("-l and -d cannot be used together, dropping -l");
+ if (m.show_emerge)
+ warn("-l and -d cannot be used together, dropping -l");
m.show_lastmerge = 0;
}
