RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 15-Oct-2008 20:49:45 Branch: HEAD Handle: 2008101518494401 Modified files: rpm CHANGES rpm/lib poptQV.c Log: - jbj: permit --whatconflicts/--whatobsoletes to be displayed with --help. Summary: Revision Changes Path 1.2616 +1 -0 rpm/CHANGES 2.56 +2 -2 rpm/lib/poptQV.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2615 -r1.2616 CHANGES --- rpm/CHANGES 15 Oct 2008 18:42:38 -0000 1.2615 +++ rpm/CHANGES 15 Oct 2008 18:49:44 -0000 1.2616 @@ -1,5 +1,6 @@ 5.2a1 -> 5.2a2: + - jbj: permit --whatconflicts/--whatobsoletes to be displayed with --help. - jbj: add flag to keep trailing slash in dirnames dependency set. - jbj: fix a memory leak by calling mireClean(). - jbj: save rpmdb trigger patterns in psm.c, eliminating 2nd retrieve. @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptQV.c ============================================================================ $ cvs diff -u -r2.55 -r2.56 poptQV.c --- rpm/lib/poptQV.c 14 Oct 2008 22:03:52 -0000 2.55 +++ rpm/lib/poptQV.c 15 Oct 2008 18:49:45 -0000 2.56 @@ -172,9 +172,9 @@ { "whatprovides", '\0', 0, NULL, POPT_WHATPROVIDES, N_("query/verify the package(s) which provide a dependency"), "CAPABILITY" }, - { "whatconflicts", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_WHATCONFLICTS, + { "whatconflicts", '\0', 0, NULL, POPT_WHATCONFLICTS, N_("query/verify the package(s) which conflict with a dependency"), "CAPABILITY" }, - { "whatobsoletes", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_WHATOBSOLETES, + { "whatobsoletes", '\0', 0, NULL, POPT_WHATOBSOLETES, N_("query/verify the package(s) which obsolete a dependency"), "CAPABILITY" }, { "transaction", 'T', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, (RPMGI_TSADD|RPMGI_TSORDER), @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org