[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/rpmio/ Makefile.am rpmdpkg.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2009-01-25 0:26:26
Message-ID: 20090125002626.29FBA2121D4 () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   25-Jan-2009 01:26:26
  Branch: HEAD                             Handle: 2009012500262500

  Modified files:
    rpm/rpmio               Makefile.am rpmdpkg.c

  Log:
    - jbj: rpmdpkg: hide some weirdo administrative options.
    - jbj: rpmdpkg: wire up rpmdpkg to use rpmcliInit, not rpmioInit.

  Summary:
    Revision    Changes     Path
    1.205       +1  -1      rpm/rpmio/Makefile.am
    1.5         +19 -10     rpm/rpmio/rpmdpkg.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.204 -r1.205 Makefile.am
  --- rpm/rpmio/Makefile.am	20 Jan 2009 23:02:23 -0000	1.204
  +++ rpm/rpmio/Makefile.am	25 Jan 2009 00:26:25 -0000	1.205
  @@ -243,7 +243,7 @@
   rpmcurl_LDADD = $(RPMIO_LDADD_COMMON)
   
   rpmdpkg_SOURCES = rpmdpkg.c
  -rpmdpkg_LDADD = $(RPMIO_LDADD_COMMON)
  +rpmdpkg_LDADD = $(RPM_LDADD_COMMON)
   
   rpmgenbasedir = rpmgenbasedir.c
   rpmgenbasedir_LDADD = $(RPMIO_LDADD_COMMON)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdpkg.c
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rpmdpkg.c
  --- rpm/rpmio/rpmdpkg.c	21 Jan 2009 21:01:33 -0000	1.4
  +++ rpm/rpmio/rpmdpkg.c	25 Jan 2009 00:26:25 -0000	1.5
  @@ -1,7 +1,16 @@
   #include "system.h"
   
   #include <rpmio.h>
  +#ifdef	DYING
   #include <poptIO.h>
  +#define	rpmcliInit		rpmioInit
  +#define	rpmcliFini		rpmioFini
  +#define	rpmcliAllPoptTable	rpmioAllPoptTable
  +#
  +#else
  +#include <argv.h>
  +#include <rpmcli.h>
  +#endif
   
   #include "debug.h"
   
  @@ -178,17 +187,17 @@
     { "search", 'S', POPT_ARG_STRING, NULL, 'S',
           N_("Find package(s) owning file(s)."), N_("<pattern>") },
   
  -  { "assert-support-predepends", '\0', POPT_ARG_NONE, NULL, \
POPT_DPKG_ASSERT_SUPPORT_PREDEPENDS,  +  { "assert-support-predepends", '\0', \
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_ASSERT_SUPPORT_PREDEPENDS,  \
                N_("?assert-support-predepends?"), NULL },
  -  { "assert-working-epoch", '\0', POPT_ARG_NONE, NULL, \
POPT_DPKG_ASSERT_WORKING_EPOCH,  +  { "assert-working-epoch", '\0', \
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_ASSERT_WORKING_EPOCH,  \
                N_("?assert-working-epoch?"), NULL },
  -  { "assert-long-filenames", '\0', POPT_ARG_NONE, NULL, \
POPT_DPKG_ASSERT_LONG_FILENAMES,  +  { "assert-long-filenames", '\0', \
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_ASSERT_LONG_FILENAMES,  \
                N_("?assert-long-filenames?"), NULL },
  -  { "assert-multi-conrep", '\0', POPT_ARG_NONE, NULL, \
POPT_DPKG_ASSERT_MULTI_CONREP,  +  { "assert-multi-conrep", '\0', \
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_ASSERT_MULTI_CONREP,  \
                N_("?assert-multi-conrep?"), NULL },
  -  { "print-architecture", '\0', POPT_ARG_NONE, NULL, POPT_DPKG_PRINT_ARCH,
  +  { "print-architecture", '\0', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, \
POPT_DPKG_PRINT_ARCH,  N_("Print dpkg architecture."), NULL },
  -  { "print-installation-architecture", '\0', POPT_ARG_NONE, NULL, \
POPT_DPKG_PRINT_INSTALL_ARCH,  +  { "print-installation-architecture", '\0', \
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_PRINT_INSTALL_ARCH,  N_("Print \
                dpkg installation architecture."), NULL },
     { "predep-package", '\0', POPT_ARG_NONE, NULL, POPT_DPKG_PREDEP_PACKAGE,
           N_("?predep-package?"), NULL },
  @@ -318,8 +327,8 @@
     { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmdpkgOptionsPoptTable, 0,
           N_("Options:"), NULL },
   
  - { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0,
  -	N_("Common options for all rpmio executables:"),
  + { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
  +	N_("Common options for all executables:"),
   	NULL },
   
     POPT_AUTOALIAS
  @@ -413,7 +422,7 @@
   	/*@modifies __assert_program_name, _rpmrepo,
   		rpmGlobalMacroContext, fileSystem, internalState @*/
   {
  -    poptContext optCon = rpmioInit(argc, argv, optionsTable);
  +    poptContext optCon = rpmcliInit(argc, argv, optionsTable);
       const char ** av = NULL;
       int ac;
       int rc = 1;		/* assume failure. */
  @@ -436,7 +445,7 @@
       rc = 0;
   
   exit:
  -    optCon = rpmioFini(optCon);
  +    optCon = rpmcliFini(optCon);
   
       return rc;
   }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org


[prev in list] [next in list] [prev in thread] [next in thread]