RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 28-Mar-2016 21:12:14
Branch: rpm-5_4 Handle: 2016032819121400
Modified files: (Branch: rpm-5_4)
rpm rpmqv.c
Log:
- build: don't assume -v if --quiet was given.
- build: permit --noparentdirs/--nolinktos with rpmbuild.
Summary:
Revision Changes Path
1.167.4.12 +3 -1 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.167.4.11 -r1.167.4.12 rpmqv.c
--- rpm/rpmqv.c 13 Aug 2014 16:40:12 -0000 1.167.4.11
+++ rpm/rpmqv.c 28 Mar 2016 19:12:14 -0000 1.167.4.12
@@ -181,7 +181,7 @@
#endif
#endif /* IAM_RPMQV */
-#if defined(IAM_RPMQV) || defined(IAM_RPMEIU)
+#if defined(IAM_RPMQV) || defined(IAM_RPMEIU) || defined(IAM_RPMBT)
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliDepFlagsPoptTable, 0,
N_("Dependency check/order options:"),
NULL },
@@ -861,6 +861,7 @@
{ const char * pkg;
int nbuilds = 0;
+ if (rpmIsNormal())
while (!rpmIsVerbose())
rpmIncreaseVerbosity();
@@ -907,6 +908,7 @@
#if defined(RPM_VENDOR_OPENPKG) /*
no-auto-verbose-increase-for-track-and-fetch */
if (ba->buildChar != 't' && ba->buildChar != 'f')
#endif
+ if (rpmIsNormal())
while (!rpmIsVerbose())
rpmIncreaseVerbosity();
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
