Rescusitate doxygen file manifest.

CVS patchset: 5968
CVS date: 2002/12/24 17:06:35

diff --git a/Doxyfile.in b/Doxyfile.in
index b5dafbe..08e73b7 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -413,6 +413,8 @@ INPUT                  = \
        @top_srcdir@/build/poptBT.c \
        @top_srcdir@/build/reqprov.c \
        @top_srcdir@/build/rpmbuild.h \
+       @top_srcdir@/build/rpmfc.c \
+       @top_srcdir@/build/rpmfc.h \
        @top_srcdir@/build/rpmspec.h \
        @top_srcdir@/build/spec.c \
        @top_srcdir@/doc/manual/builddependencies \
@@ -429,6 +431,16 @@ INPUT                  = \
        @top_srcdir@/doc/manual/spec \
        @top_srcdir@/doc/manual/triggers \
        @top_srcdir@/doc/manual/tsort \
+       @top_srcdir@/file/apprentice.c \
+       @top_srcdir@/file/ascmagic.c \
+       @top_srcdir@/file/compress.c \
+       @top_srcdir@/file/file.c \
+       @top_srcdir@/file/file.h \
+       @top_srcdir@/file/fsmagic.c \
+       @top_srcdir@/file/print.c \
+       @top_srcdir@/file/readelf.c \
+       @top_srcdir@/file/readelf.h \
+       @top_srcdir@/file/softmagic.c \
        @top_srcdir@/lib/cpio.c \
        @top_srcdir@/lib/cpio.h \
        @top_srcdir@/lib/depends.c \
@@ -450,9 +462,11 @@ INPUT                  = \
        @top_srcdir@/lib/rpmal.c \
        @top_srcdir@/lib/rpmal.h \
        @top_srcdir@/lib/rpmchecksig.c \
+       @top_srcdir@/lib/rpmcli.h \
        @top_srcdir@/lib/rpmds.c \
        @top_srcdir@/lib/rpmds.h \
-       @top_srcdir@/lib/rpmcli.h \
+       @top_srcdir@/lib/rpmfi.c \
+       @top_srcdir@/lib/rpmfi.h \
        @top_srcdir@/lib/rpminstall.c \
        @top_srcdir@/lib/rpmlead.c \
        @top_srcdir@/lib/rpmlead.h \
@@ -492,6 +506,8 @@ INPUT                  = \
        @top_srcdir@/rpmdb/rpmdb.h \
        @top_srcdir@/rpmdb/tagname.c \
        @top_srcdir@/rpmdb/tagtbl.c \
+       @top_srcdir@/rpmio/argv.c \
+       @top_srcdir@/rpmio/argv.h \
        @top_srcdir@/rpmio/digest.c \
        @top_srcdir@/rpmio/fts.c \
        @top_srcdir@/rpmio/fts.h \
@@ -529,6 +545,8 @@ INPUT                  = \
        @top_srcdir@/python/header-py.h \
        @top_srcdir@/python/rpmal-py.c \
        @top_srcdir@/python/rpmal-py.h \
+       @top_srcdir@/python/rpmbc-py.c \
+       @top_srcdir@/python/rpmbc-py.h \
        @top_srcdir@/python/rpmdb-py.c \
        @top_srcdir@/python/rpmdb-py.h \
        @top_srcdir@/python/rpmds-py.c \
@@ -537,6 +555,8 @@ INPUT                  = \
        @top_srcdir@/python/rpmfd-py.h \
        @top_srcdir@/python/rpmfi-py.c \
        @top_srcdir@/python/rpmfi-py.h \
+       @top_srcdir@/python/rpmfts-py.c \
+       @top_srcdir@/python/rpmfts-py.h \
        @top_srcdir@/python/rpmmi-py.c \
        @top_srcdir@/python/rpmmi-py.h \
        @top_srcdir@/python/rpmmodule.c \
@@ -553,11 +573,43 @@ INPUT                  = \
        @top_srcdir@/tools/javadeps.c \
        @top_srcdir@/tools/rpmarchive.c \
        @top_srcdir@/tools/rpmcache.c \
+       @top_srcdir@/tools/rpmdeps.c \
        @top_srcdir@/tools/rpmgraph.c \
        @top_srcdir@/tools/rpmheader.c \
        @top_srcdir@/tools/rpminject.c \
        @top_srcdir@/tools/rpmlead.c \
-       @top_srcdir@/tools/rpmsignature.c
+       @top_srcdir@/tools/rpmsignature.c \
+       @top_srcdir@/zlib/adler32.c \
+       @top_srcdir@/zlib/crc32.c \
+       @top_srcdir@/zlib/crc32.h \
+       @top_srcdir@/zlib/deflate.c \
+       @top_srcdir@/zlib/deflate.h \
+       @top_srcdir@/zlib/gzio.c \
+       @top_srcdir@/zlib/infblock.c \
+       @top_srcdir@/zlib/infblock.h \
+       @top_srcdir@/zlib/infcodes.c \
+       @top_srcdir@/zlib/infcodes.h \
+       @top_srcdir@/zlib/inffast.c \
+       @top_srcdir@/zlib/inffast.h \
+       @top_srcdir@/zlib/inffixed.h \
+       @top_srcdir@/zlib/inflate.c \
+       @top_srcdir@/zlib/inftrees.c \
+       @top_srcdir@/zlib/inftrees.h \
+       @top_srcdir@/zlib/infutil.c \
+       @top_srcdir@/zlib/infutil.h \
+       @top_srcdir@/zlib/maketree.c \
+       @top_srcdir@/zlib/minigzip.c \
+       @top_srcdir@/zlib/trees.c \
+       @top_srcdir@/zlib/trees.h \
+       @top_srcdir@/zlib/uncompr.c \
+       @top_srcdir@/zlib/zconf.h \
+       @top_srcdir@/zlib/zlib.h \
+       @top_srcdir@/zlib/zutil.c \
+       @top_srcdir@/zlib/zutil.h
+
+
+# XX file name collision here
+#      @top_srcdir@/zlib/compress.c
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

diff --git a/build/Makefile.am b/build/Makefile.am
index 32fd04b..3c57e70 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -16,13 +16,13 @@ INCLUDES = -I. \
 LIBS =
 
 pkgincdir = $(pkgincludedir)
-pkginc_HEADERS = argv.h rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
+pkginc_HEADERS = rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
 noinst_HEADERS = buildio.h
 
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = librpmbuild.la
 librpmbuild_la_SOURCES = \
-       argv.c build.c expression.c files.c misc.c names.c pack.c \
+       build.c expression.c files.c misc.c names.c pack.c \
        parseBuildInstallClean.c parseChangelog.c parseDescription.c \
        parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
        parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c

diff --git a/build/files.c b/build/files.c
index 938989a..75e43e6 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -324,7 +324,7 @@ VFA_t verifyAttrs[] = {
 
 /**
  * Parse %verify and %defverify from file manifest.
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @return             0 on success
  */
@@ -422,7 +422,7 @@ static int parseForVerify(char * buf, FileList fl)
 
 /**
  * Parse %dev from file manifest.
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @return             0 on success
  */
@@ -524,7 +524,7 @@ exit:
 
 /**
  * Parse %attr and %defattr from file manifest.
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @return             0 on success
  */
@@ -657,7 +657,7 @@ static int parseForAttr(char * buf, FileList fl)
 
 /**
  * Parse %config from file manifest.
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @return             0 on success
  */
@@ -673,6 +673,7 @@ static int parseForConfig(char * buf, FileList fl)
 
     fl->currentFlags |= RPMFILE_CONFIG;
 
+    /* Erase "%config" token. */
     for (pe = p; (pe-p) < strlen(name); pe++)
        *pe = ' ';
     SKIPSPACE(pe);
@@ -690,7 +691,7 @@ static int parseForConfig(char * buf, FileList fl)
        return RPMERR_BADSPEC;
     }
 
-    /* Localize. Erase parsed string */
+    /* Localize. Erase parsed string. */
     q = alloca((pe-p) + 1);
     strncpy(q, p, pe-p);
     q[pe-p] = '\0';
@@ -732,7 +733,7 @@ static int langCmp(const void * ap, const void * bp)
 
 /**
  * Parse %lang from file manifest.
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @return             0 on success
  */
@@ -882,13 +883,14 @@ VFA_t virtualFileAttributes[] = {
        { "%exclude",   0,      RPMFILE_EXCLUDE },
        { "%readme",    0,      RPMFILE_README },
        { "%license",   0,      RPMFILE_LICENSE },
+       { "%pubkey",    0,      RPMFILE_PUBKEY },
 
 #if WHY_NOT
-       { "%spec",      RPMFILE_SPEC },
-       { "%config",    RPMFILE_CONFIG },
-       { "%donotuse",  RPMFILE_DONOTUSE },     /* XXX WTFO? */
-       { "%missingok", RPMFILE_CONFIG|RPMFILE_MISSINGOK },
-       { "%noreplace", RPMFILE_CONFIG|RPMFILE_NOREPLACE },
+       { "%icon",      0,      RPMFILE_ICON },
+       { "%spec",      0,      RPMFILE_SPEC },
+       { "%config",    0,      RPMFILE_CONFIG },
+       { "%missingok", 0,      RPMFILE_CONFIG|RPMFILE_MISSINGOK },
+       { "%noreplace", 0,      RPMFILE_CONFIG|RPMFILE_NOREPLACE },
 #endif
 
        { NULL, 0, 0 }
@@ -899,7 +901,7 @@ VFA_t virtualFileAttributes[] = {
  * Parse simple attributes (e.g. %dir) from file manifest.
  * @param spec
  * @param pkg
- * @param buf
+ * @param buf          current spec file line
  * @param fl           package file tree walk data
  * @retval fileName
  * @return             0 on success
@@ -977,7 +979,7 @@ static int parseForSimple(/*@unused@*/Spec spec, Package pkg, char * buf,
                specialDoc = 1;
                strcat(specialDocBuf, " ");
                strcat(specialDocBuf, s);
-           } else {
+           } else if (!(fl->currentFlags & (RPMFILE_PUBKEY|RPMFILE_ICON))) {
                /* not in %doc, does not begin with / -- error */
                rpmError(RPMERR_BADSPEC,
                    _("File must begin with \"/\": %s\n"), s);

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 53d39b2..9dd3e4c 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -272,10 +272,10 @@ static int rpmfcSaveArg(/*@out@*/ ARGV_t * argvp, const char * key)
 }
 
 static char * rpmfcFileDep(/*@returned@*/ char * buf, int ix,
-               /*@null@*/ rpmds this)
+               /*@null@*/ rpmds ds)
        /*@modifies buf @*/
 {
-    int_32 tagN = rpmdsTagN(this);
+    int_32 tagN = rpmdsTagN(ds);
     char deptype = 'X';
 
 /*@-boundswrite@*/
@@ -290,9 +290,9 @@ static char * rpmfcFileDep(/*@returned@*/ char * buf, int ix,
        break;
     }
 /*@-nullpass@*/
-    if (this != NULL)
+    if (ds != NULL)
        sprintf(buf, "%08d%c %s %s 0x%08x", ix, deptype,
-               rpmdsN(this), rpmdsEVR(this), rpmdsFlags(this));
+               rpmdsN(ds), rpmdsEVR(ds), rpmdsFlags(ds));
 /*@=nullpass@*/
     return buf;
 };
@@ -314,7 +314,7 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
     StringBuf sb_stdout = NULL;
     StringBuf sb_stdin;
     const char *av[2];
-    rpmds * depsp, this;
+    rpmds * depsp, ds;
     const char * N;
     const char * EVR;
     int_32 Flags, dsContext, tagN;
@@ -392,23 +392,23 @@ assert(EVR != NULL);
 
            /* Add tracking dependency for versioned Provides: */
            if (!fc->tracked && deptype == 'P' && *EVR != '\0') {
-               this = rpmdsSingle(RPMTAG_REQUIRENAME,
+               ds = rpmdsSingle(RPMTAG_REQUIRENAME,
                        "rpmlib(VersionedDependencies)", "3.0.3-1",
                        RPMSENSE_RPMLIB|(RPMSENSE_LESS|RPMSENSE_EQUAL));
-               xx = rpmdsMerge(&fc->requires, this);
-               this = rpmdsFree(this);
+               xx = rpmdsMerge(&fc->requires, ds);
+               ds = rpmdsFree(ds);
                fc->tracked = 1;
            }
 
-           this = rpmdsSingle(tagN, N, EVR, Flags);
+           ds = rpmdsSingle(tagN, N, EVR, Flags);
 
            /* Add to package dependencies. */
-           xx = rpmdsMerge(depsp, this);
+           xx = rpmdsMerge(depsp, ds);
 
            /* Add to file dependencies. */
-           xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, this));
+           xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, ds));
 
-           this = rpmdsFree(this);
+           ds = rpmdsFree(ds);
        }
 
        pav = argvFree(pav);
@@ -635,7 +635,7 @@ static int rpmfcSCRIPT(rpmfc fc)
 {
     const char * fn = fc->fn[fc->ix];
     const char * bn;
-    rpmds this;
+    rpmds ds;
     char buf[BUFSIZ];
     FILE * fp;
     char * s, * se;
@@ -681,13 +681,13 @@ static int rpmfcSCRIPT(rpmfc fc)
        se++;
 
        /* Add to package requires. */
-       this = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
-       xx = rpmdsMerge(&fc->requires, this);
+       ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
+       xx = rpmdsMerge(&fc->requires, ds);
 
        /* Add to file requires. */
-       xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(se, fc->ix, this));
+       xx = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(se, fc->ix, ds));
 
-       this = rpmdsFree(this);
+       ds = rpmdsFree(ds);
 
        /* Set color based on interpreter name. */
        bn = basename(s);
@@ -739,7 +739,7 @@ static int rpmfcELF(rpmfc fc)
     unsigned char deptype;
     struct stat sb, * st = &sb;
     const char * soname = NULL;
-    rpmds * depsp, this;
+    rpmds * depsp, ds;
     int_32 tagN, dsContext;
     char * t;
     int xx;
@@ -817,15 +817,15 @@ static int rpmfcELF(rpmfc fc)
                            t++;
 
                            /* Add to package provides. */
-                           this = rpmdsSingle(RPMTAG_PROVIDES,
+                           ds = rpmdsSingle(RPMTAG_PROVIDES,
                                        buf, "", RPMSENSE_FIND_PROVIDES);
-                           xx = rpmdsMerge(&fc->provides, this);
+                           xx = rpmdsMerge(&fc->provides, ds);
 
                            /* Add to file dependencies. */
                            xx = rpmfcSaveArg(&fc->ddict,
-                                       rpmfcFileDep(t, fc->ix, this));
+                                       rpmfcFileDep(t, fc->ix, ds));
 
-                           this = rpmdsFree(this);
+                           ds = rpmdsFree(ds);
                        }
                        auxoffset += aux->vda_next;
                    }
@@ -873,14 +873,14 @@ static int rpmfcELF(rpmfc fc)
                            t++;
 
                            /* Add to package dependencies. */
-                           this = rpmdsSingle(RPMTAG_REQUIRENAME,
+                           ds = rpmdsSingle(RPMTAG_REQUIRENAME,
                                        buf, "", RPMSENSE_FIND_REQUIRES);
-                           xx = rpmdsMerge(&fc->requires, this);
+                           xx = rpmdsMerge(&fc->requires, ds);
 
                            /* Add to file dependencies. */
                            xx = rpmfcSaveArg(&fc->ddict,
-                                       rpmfcFileDep(t, fc->ix, this));
-                           this = rpmdsFree(this);
+                                       rpmfcFileDep(t, fc->ix, ds));
+                           ds = rpmdsFree(ds);
                        }
                        auxoffset += aux->vna_next;
                    }
@@ -938,14 +938,14 @@ assert(s != NULL);
                    t++;
 
                    /* Add to package dependencies. */
-                   this = rpmdsSingle(tagN, buf, "", dsContext);
-                   xx = rpmdsMerge(depsp, this);
+                   ds = rpmdsSingle(tagN, buf, "", dsContext);
+                   xx = rpmdsMerge(depsp, ds);
 
                    /* Add to file dependencies. */
                    xx = rpmfcSaveArg(&fc->ddict,
-                                       rpmfcFileDep(t, fc->ix, this));
+                                       rpmfcFileDep(t, fc->ix, ds));
 
-                   this = rpmdsFree(this);
+                   ds = rpmdsFree(ds);
                }
            }
            /*@switchbreak@*/ break;
@@ -981,7 +981,7 @@ int rpmfcApply(rpmfc fc)
 {
     const char * s;
     char * se;
-    rpmds this;
+    rpmds ds;
     const char * N;
     const char * EVR;
     int_32 Flags;
@@ -1031,14 +1031,14 @@ assert(se != NULL);
        default:
            /*@switchbreak@*/ break;
        case 'P':       
-           this = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags);
-           dix = rpmdsFind(fc->provides, this);
-           this = rpmdsFree(this);
+           ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags);
+           dix = rpmdsFind(fc->provides, ds);
+           ds = rpmdsFree(ds);
            /*@switchbreak@*/ break;
        case 'R':
-           this = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags);
-           dix = rpmdsFind(fc->requires, this);
-           this = rpmdsFree(this);
+           ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags);
+           dix = rpmdsFind(fc->requires, ds);
+           ds = rpmdsFree(ds);
            /*@switchbreak@*/ break;
        }
 
@@ -1397,7 +1397,8 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg)
            N = rpmdsN(pkg->ds);
            EVR = rpmdsEVR(pkg->ds);
            sprintf(buf, "config(%s)", N);
-           ds = rpmdsSingle(RPMTAG_PROVIDENAME, buf, EVR, RPMSENSE_EQUAL);
+           ds = rpmdsSingle(RPMTAG_PROVIDENAME, buf, EVR,
+                       (RPMSENSE_EQUAL|RPMSENSE_CONFIG));
            xx = rpmdsMerge(&fc->provides, ds);
            ds = rpmdsFree(ds);
        }
@@ -1416,7 +1417,8 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg)
            N = rpmdsN(pkg->ds);
            EVR = rpmdsEVR(pkg->ds);
            sprintf(buf, "config(%s)", N);
-           ds = rpmdsSingle(RPMTAG_REQUIRENAME, buf, EVR, RPMSENSE_EQUAL);
+           ds = rpmdsSingle(RPMTAG_REQUIRENAME, buf, EVR,
+                       (RPMSENSE_EQUAL|RPMSENSE_CONFIG));
            xx = rpmdsMerge(&fc->requires, ds);
            ds = rpmdsFree(ds);
        }

diff --git a/build/rpmfc.h b/build/rpmfc.h
index a041926..92b92c7 100644 (file)
--- a/build/rpmfc.h
+++ b/build/rpmfc.h
@@ -98,6 +98,11 @@ extern "C" {
 #endif
 
 /**
+ * Return helper output.
+ * @param av           helper argv (with possible macros)
+ * @param sb_stdin     helper input
+ * @retval *sb_stdoutp helper output
+ * @param failnonzero  IS non-zero helper exit status a failure?
  */
 int rpmfcExec(ARGV_t av, StringBuf sb_stdin, /*@out@*/ StringBuf * sb_stdoutp,
                int failnonzero)
@@ -106,6 +111,9 @@ int rpmfcExec(ARGV_t av, StringBuf sb_stdin, /*@out@*/ StringBuf * sb_stdoutp,
                fileSystem, internalState @*/;
 
 /**
+ * Return file color given file(1) string.
+ * @param fmstr                file(1) string
+ * @return             file color
  */
 /*@-exportlocal@*/
 int rpmfcColoring(const char * fmstr)
@@ -113,10 +121,14 @@ int rpmfcColoring(const char * fmstr)
 /*@=exportlocal@*/
 
 /**
+ * Print results of file classification.
+ * @todo Remove debugging routine.
+ * @param msg          message prefix (NULL for none)
  * @param fc           file classifier
+ * @param fp           output file handle (NULL for stderr)
  */
 /*@-exportlocal@*/
-void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
+void rpmfcPrint(/*@null@*/ const char * msg, rpmfc fc, /*@null@*/ FILE * fp)
        /*@globals fileSystem @*/
        /*@modifies *fp, fc, fileSystem @*/;
 /*@=exportlocal@*/

diff --git a/lib/poptI.c b/lib/poptI.c
index 07a90c7..d8c41e2 100644 (file)
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -147,8 +147,7 @@ struct poptOption rpmInstallPoptTable[] = {
        installArgCallback, 0, NULL, NULL },
 /*@=type@*/
 
- { "aid", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
-       &rpmIArgs.transFlags, RPMTRANS_FLAG_ADDINDEPS,
+ { "aid", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_ADDINDEPS,
        N_("add suggested packages to transaction"), NULL },
 
  { "allfiles", '\0', POPT_BIT_SET,
@@ -174,6 +173,9 @@ struct poptOption rpmInstallPoptTable[] = {
  { "erase", 'e', POPT_BIT_SET,
        &rpmIArgs.installInterfaceFlags, INSTALL_ERASE,
        N_("erase (uninstall) package"), N_("<package>+") },
+ { "excludeconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+       &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS,
+       N_("do not install configuration files"), NULL},
  { "excludedocs", '\0', POPT_BIT_SET,
        &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
        N_("do not install documentation"), NULL},
@@ -181,14 +183,8 @@ struct poptOption rpmInstallPoptTable[] = {
        N_("skip files with leading component <path> "),
        N_("<path>") },
 
-#ifdef DYING
- { "force", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
-       (RPMPROB_FILTER_REPLACEPKG | RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES | RPMPROB_FILTER_OLDPACKAGE),
-       N_("short hand for --replacepkgs --replacefiles"), NULL},
-#else
  { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
        N_("short hand for --replacepkgs --replacefiles"), NULL},
-#endif
 
  { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
        (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
@@ -208,25 +204,20 @@ struct poptOption rpmInstallPoptTable[] = {
  { "includedocs", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.incldocs, 0,
        N_("install documentation"), NULL},
 
-#ifdef DYING
- { "install", '\0', POPT_BIT_SET,
-       &rpmIArgs.installInterfaceFlags, INSTALL_INSTALL,
-       N_("install package(s)"), N_("<packagefile>+") },
-#else
  { "install", 'i', 0, NULL, 'i',
        N_("install package(s)"), N_("<packagefile>+") },
-#endif
 
  { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB,
        N_("update the database, but do not modify the filesystem"), NULL},
 
-#ifdef DYING
- { "nodeps", '\0', 0, &rpmIArgs.noDeps, 0,
-       N_("do not verify package dependencies"), NULL },
-#else
+ { "noconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+       &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS,
+       N_("do not install configuration files"), NULL},
  { "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
        N_("do not verify package dependencies"), NULL },
-#endif
+ { "nodocs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+       &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
+       N_("do not install documentation"), NULL},
 
  { "nomd5", '\0', 0, NULL, RPMCLI_POPT_NOMD5,
        N_("don't verify MD5 digest of files"), NULL },
@@ -239,14 +230,9 @@ struct poptOption rpmInstallPoptTable[] = {
        RPMTRANS_FLAG_NOSUGGEST,
        N_("do not suggest missing dependency resolution(s)"), NULL},
 
-#ifdef DYING
- { "noscripts", '\0', POPT_BIT_SET, &rpmIArgs.transFlags,
-       (_noTransScripts|_noTransTriggers),
-       N_("do not execute package scriptlet(s)"), NULL },
-#else
  { "noscripts", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS,
        N_("do not execute package scriptlet(s)"), NULL },
-#endif
+
  { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
        RPMTRANS_FLAG_NOPRE,
        N_("do not execute %%pre scriptlet (if any)"), NULL },
@@ -260,21 +246,12 @@ struct poptOption rpmInstallPoptTable[] = {
        RPMTRANS_FLAG_NOPOSTUN,
        N_("do not execute %%postun scriptlet (if any)"), NULL },
 
-#ifdef DYING
- { "nodigest", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_DIGEST,
-        N_("don't verify package digest(s)"), NULL },
- { "nohdrchk", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.qva_flags, VERIFY_HDRCHK,
-        N_("don't verify database header(s) when retrieved"), NULL },
- { "nosignature", '\0', POPT_BIT_SET, &rpmIArgs.qva_flags, VERIFY_SIGNATURE,
-        N_("don't verify package signature(s)"), NULL },
-#else
  { "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NODIGEST,
         N_("don't verify package digest(s)"), NULL },
  { "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOHDRCHK,
         N_("don't verify database header(s) when retrieved"), NULL },
  { "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, RPMCLI_POPT_NOSIGNATURE,
         N_("don't verify package signature(s)"), NULL },
-#endif
 
  { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers,
        N_("do not execute any scriptlet(s) triggered by this package"), NULL},

diff --git a/lib/rpmfi.h b/lib/rpmfi.h
index 26e8da2..e6c7bdc 100644 (file)
--- a/lib/rpmfi.h
+++ b/lib/rpmfi.h
@@ -151,6 +151,7 @@ extern "C" {
 /**
  * Unreference a file info set instance.
  * @param fi           file info set
+ * @param msg
  * @return             NULL always
  */
 /*@unused@*/ /*@null@*/
@@ -158,7 +159,13 @@ rpmfi rpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi,
                /*@null@*/ const char * msg)
        /*@modifies fi @*/;
 
-/** @todo Remove debugging entry from the ABI. */
+/** @todo Remove debugging entry from the ABI.
+ * @param fi           file info set
+ * @param msg
+ * @param fn
+ * @param ln
+ * @return             NULL always
+ */
 /*@-exportlocal@*/
 /*@null@*/
 rpmfi XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi,
@@ -170,13 +177,20 @@ rpmfi XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ rpmfi fi,
 /**
  * Reference a file info set instance.
  * @param fi           file info set
+ * @param msg
  * @return             new file info set reference
  */
 /*@unused@*/
 rpmfi rpmfiLink (/*@null@*/ rpmfi fi, /*@null@*/ const char * msg)
        /*@modifies fi @*/;
 
-/** @todo Remove debugging entry from the ABI. */
+/** @todo Remove debugging entry from the ABI.
+ * @param fi           file info set
+ * @param msg
+ * @param fn
+ * @param ln
+ * @return             NULL always
+ */
 rpmfi XrpmfiLink (/*@null@*/ rpmfi fi, /*@null@*/ const char * msg,
                const char * fn, unsigned ln)
         /*@modifies fi @*/;
@@ -228,7 +242,7 @@ int rpmfiDX(/*@null@*/ rpmfi fi)
 /**
  * Set current directory index in file info set.
  * @param fi           file info set
- * @param fx           new directory index
+ * @param dx           new directory index
  * @return             current directory index
  */
 int rpmfiSetDX(/*@null@*/ rpmfi fi, int dx)

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 16d9a88..0b4b240 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -412,19 +412,18 @@ typedef   enum rpmfileAttrs_e {
 /*@-enummemuse@*/
     RPMFILE_NONE       = 0,
 /*@=enummemuse@*/
-    RPMFILE_CONFIG     = (1 << 0),     /*!< from %%config */
-    RPMFILE_DOC                = (1 << 1),     /*!< from %%doc */
-/*@-enummemuse@*/
-    RPMFILE_DONOTUSE   = (1 << 2),     /*!< @todo (unimplemented) from %donotuse. */
-/*@=enummemuse@*/
-    RPMFILE_MISSINGOK  = (1 << 3),     /*!< from %%config(missingok) */
-    RPMFILE_NOREPLACE  = (1 << 4),     /*!< from %%config(noreplace) */
-    RPMFILE_SPECFILE   = (1 << 5),     /*!< @todo (unnecessary) marks 1st file in srpm. */
-    RPMFILE_GHOST      = (1 << 6),     /*!< from %%ghost */
-    RPMFILE_LICENSE    = (1 << 7),     /*!< from %%license */
-    RPMFILE_README     = (1 << 8),     /*!< from %%readme */
-    RPMFILE_EXCLUDE    = (1 << 9),     /*!< from %%exclude */
-    RPMFILE_UNPATCHED  = (1 << 10)     /*!< placeholder (SuSE) */
+    RPMFILE_CONFIG     = (1 <<  0),    /*!< from %%config */
+    RPMFILE_DOC                = (1 <<  1),    /*!< from %%doc */
+    RPMFILE_ICON       = (1 <<  2),    /*!< from %%donotuse. */
+    RPMFILE_MISSINGOK  = (1 <<  3),    /*!< from %%config(missingok) */
+    RPMFILE_NOREPLACE  = (1 <<  4),    /*!< from %%config(noreplace) */
+    RPMFILE_SPECFILE   = (1 <<  5),    /*!< @todo (unnecessary) marks 1st file in srpm. */
+    RPMFILE_GHOST      = (1 <<  6),    /*!< from %%ghost */
+    RPMFILE_LICENSE    = (1 <<  7),    /*!< from %%license */
+    RPMFILE_README     = (1 <<  8),    /*!< from %%readme */
+    RPMFILE_EXCLUDE    = (1 <<  9),    /*!< from %%exclude */
+    RPMFILE_UNPATCHED  = (1 << 10),    /*!< placeholder (SuSE) */
+    RPMFILE_PUBKEY     = (1 << 11),    /*!< from %%pubkey */
 } rpmfileAttrs;
 #define        RPMFILE_MULTILIB_SHIFT          12
 #define        RPMFILE_MULTILIB(N)             ((N) << RPMFILE_MULTILIB_SHIFT)
@@ -472,7 +471,8 @@ typedef     enum rpmsenseFlags_e {
     RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< @todo Implement %triggerprein. */
 /*@=enummemuse@*/
     RPMSENSE_KEYRING   = (1 << 26),
-    RPMSENSE_PATCHES   = (1 << 27)
+    RPMSENSE_PATCHES   = (1 << 27),
+    RPMSENSE_CONFIG    = (1 << 28)
 } rpmsenseFlags;
 
 #define        RPMSENSE_SENSEMASK      15       /* Mask to get senses, ie serial, */
@@ -946,7 +946,8 @@ typedef enum rpmtransFlags_e {
 /*@=enummemuse@*/
     RPMTRANS_FLAG_NOMD5                = (1 << 27),    /*!< from --nomd5 */
     RPMTRANS_FLAG_NOSUGGEST    = (1 << 28),    /*!< from --nosuggest */
-    RPMTRANS_FLAG_ADDINDEPS    = (1 << 29)
+    RPMTRANS_FLAG_ADDINDEPS    = (1 << 29),    /*!< from --aid */
+    RPMTRANS_FLAG_NOCONFIGS    = (1 << 30)     /*!< from --noconfigs */
 } rpmtransFlags;
 
 #define        _noTransScripts         \

diff --git a/lib/transaction.c b/lib/transaction.c
index 5a5b221..fcadf4f 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -722,6 +722,9 @@ static int ensureOlder(rpmts ts,
 }
 
 /**
+ * Skip any files that do not match install policies.
+ * @param ts           transaction set
+ * @param fi           file info set
  */
 /*@-mustmod@*/ /* FIX: fi->actions is modified. */
 /*@-bounds@*/
@@ -729,6 +732,7 @@ static void skipFiles(const rpmts ts, rpmfi fi)
        /*@globals rpmGlobalMacroContext @*/
        /*@modifies fi, rpmGlobalMacroContext @*/
 {
+    int noConfigs = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCONFIGS);
     int noDocs = (rpmtsFlags(ts) & RPMTRANS_FLAG_NODOCS);
     char ** netsharedPaths = NULL;
     const char ** languages;
@@ -854,6 +858,15 @@ static void skipFiles(const rpmts ts, rpmfi fi)
        }
 
        /*
+        * Skip config files if requested.
+        */
+       if (noConfigs && (rpmfiFFlags(fi) & RPMFILE_CONFIG)) {
+           drc[ix]--;  dff[ix] = 1;
+           fi->actions[i] = FA_SKIPNSTATE;
+           continue;
+       }
+
+       /*
         * Skip documentation if requested.
         */
        if (noDocs && (rpmfiFFlags(fi) & RPMFILE_DOC)) {

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 35fe0a0..b555022 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -64,6 +64,7 @@ rpmdb/poptDB.c
 rpmdb/rpmdb.c
 rpmdb/rpmhash.c
 rpmdb/tagname.c
+rpmio/argv.c
 rpmio/digest.c
 rpmio/fts.c
 rpmio/macro.c
@@ -75,4 +76,5 @@ rpmio/rpmrpc.c
 rpmio/ugid.c
 rpmio/url.c
 tools/rpmcache.c
+tools/rpmdeps.c
 tools/rpmgraph.c

diff --git a/po/cs.po b/po/cs.po
index 2bc3090..d51cb69 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -3141,31 +3141,31 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 #, fuzzy
 msgid "shared"
 msgstr "sdílen v síti "
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/da.po b/po/da.po
index 50c3690..27f5f7c 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -3153,30 +3153,30 @@ msgstr "lukkede db-indeks %s/%s\n"
 msgid "verified db index       %s/%s\n"
 msgstr "lukkede db-indeks %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "åbner   db-indeks %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan ikke opnå %s lås på %s/%s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "eksklusiv"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "delt"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "låste   db-index  %s/%s\n"

diff --git a/po/de.po b/po/de.po
index de424c6..7e79123 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -3330,30 +3330,30 @@ msgstr "Datenbank aus der vorhandenen neu erstellen"
 msgid "verified db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "geteilt"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"

diff --git a/po/fi.po b/po/fi.po
index 7bfa8ed..c759f2d 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -3195,30 +3195,30 @@ msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 msgid "verified db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "jaettua"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"

diff --git a/po/fr.po b/po/fr.po
index 21aa420..29492cb 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3231,30 +3231,30 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "verified db index       %s/%s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "impossible d'ouvrir: %s\n"

diff --git a/po/gl.po b/po/gl.po
index f8f55c3..4f7661a 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -3045,30 +3045,30 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index 4187f48..f173c18 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -3075,30 +3075,30 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "einka"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "deildann"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index 622b3e3..252d9af 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -3244,30 +3244,30 @@ msgstr "%s 
 msgid "verified db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "¶¦Í­"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"

diff --git a/po/ko.po b/po/ko.po
index 5ed0861..41461d7 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -3129,30 +3129,30 @@ msgstr "
 msgid "verified db index       %s/%s\n"
 msgstr "°ËÁõµÈ  db À妽º      %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "¿©´ÂÁß  db À妽º      %s/%s %s ¸ðµå=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%2$s/%3$sÀÇ Àá±ÝµÈ(lock) %1$s(À»)¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "Æó¼âÀû(exclusive)"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "°øÀ¯µÊ"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "Àá±ÝµÈ  db À妽º      %s/%s\n"

diff --git a/po/no.po b/po/no.po
index c65f76e..d041cf9 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -3107,30 +3107,30 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 56f9f97..45d288d 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -3198,30 +3198,30 @@ msgstr "usuwanie indeksu plik
 msgid "verified db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "usuwanie indeksu plików dla %s\n"

diff --git a/po/pt.po b/po/pt.po
index a670432..4de7c2a 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -3140,30 +3140,30 @@ msgstr "fechei o 
 msgid "verified db index       %s/%s\n"
 msgstr "verifiquei o índice do db %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "a abrir o índice do db  %s/%s %s modo=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "não consigo trancar o %s no %s/%s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "exclusivo"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "partilhado"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "tranquei o índice do db %s/%s\n"

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b8db3c..f4091ac 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -3396,30 +3396,30 @@ msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 msgid "verified db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"

diff --git a/po/ro.po b/po/ro.po
index 5fc264b..d5b2b08 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -3045,30 +3045,30 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index bdbc69c..afed641 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3051,30 +3051,30 @@ msgstr ""
 msgid "verified db index       %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr ""
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr ""
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr ""
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 0e97e1c..5151c82 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -3096,30 +3096,30 @@ msgstr "
 msgid "verified db index       %s/%s\n"
 msgstr "ÐÒÏ×ÅÒÅÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s %s mode=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÂÌÏËÉÒÏ×ËÕ %s ÎÁ %s/%s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "ÚÁÂÌÏËÉÒÏ×ÁÎ ÉÎÄÅËÓ ÂÁÚÙ ÄÁÎÎÙÈ %s/%s\n"

diff --git a/po/sk.po b/po/sk.po
index 2a262ce..664b557 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -3194,30 +3194,30 @@ msgstr "odstra
 msgid "verified db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "výhradný"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "zdieµaný"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"

diff --git a/po/sl.po b/po/sl.po
index bc39946..f4b7349 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.346 2002/12/24 07:21:42 jbj Exp $
+# $Id: sl.po,v 1.347 2002/12/24 17:07:08 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -3197,30 +3197,30 @@ msgstr "zaprto  db kazalo       %s/%s\n"
 msgid "verified db index       %s/%s\n"
 msgstr "zaprto  db kazalo       %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "odpiranje db kazala       %s/%s %s naèin=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ni mo¾no zakleniti z %s datotek %s/%s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "skupno"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "zaklenjeno  db kazalo       %s/%s\n"

diff --git a/po/sr.po b/po/sr.po
index d40a289..4267bca 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3186,30 +3186,30 @@ msgstr "rekreiraj bazu podataka iz postoje
 msgid "verified db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, fuzzy, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, fuzzy, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "deljeno"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, fuzzy, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"

diff --git a/po/sv.po b/po/sv.po
index 08f7aaa..5e888cd 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -3080,30 +3080,30 @@ msgstr "st
 msgid "verified db index       %s/%s\n"
 msgstr "verifierade db-index %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "öppnar      db-index %s/%s %s rättighet=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "kan inte få %s lås på %s/%s\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "delat"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "låste       db-index %s/%s\n"

diff --git a/po/tr.po b/po/tr.po
index 6146c1b..9af687a 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-24 02:13-0500\n"
+"POT-Creation-Date: 2002-12-24 02:38-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -3152,30 +3152,30 @@ msgstr "kapand
 msgid "verified db index       %s/%s\n"
 msgstr "doðrulandý    db endeks %s/%s\n"
 
-#: rpmdb/db3.c:968
+#: rpmdb/db3.c:969
 #, c-format
-msgid "\tunshared posix mutexes found(%d), adding DB_PRIVATE\n"
+msgid "unshared posix mutexes found(%d), adding DB_PRIVATE, using fcntl lock\n"
 msgstr ""
 
-#: rpmdb/db3.c:1071
+#: rpmdb/db3.c:1073
 #, c-format
 msgid "opening  db index       %s/%s %s mode=0x%x\n"
 msgstr "açýlýyor       db endeks %s/%s %s kip=0x%x\n"
 
-#: rpmdb/db3.c:1308
+#: rpmdb/db3.c:1310
 #, c-format
 msgid "cannot get %s lock on %s/%s\n"
 msgstr "%s kilit  %s/%s'den alýnamadý\n"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "exclusive"
 msgstr "baðdaþýk"
 
-#: rpmdb/db3.c:1310
+#: rpmdb/db3.c:1312
 msgid "shared"
 msgstr "paylaþýmlý"
 
-#: rpmdb/db3.c:1314
+#: rpmdb/db3.c:1316
 #, c-format
 msgid "locked   db index       %s/%s\n"
 msgstr "kilitli      db endeks %s/%s\n"

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index cdc8e9b..b2df040 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -459,11 +459,15 @@ void initrpm(void)
 
     REGISTER_ENUM(RPMFILE_CONFIG);
     REGISTER_ENUM(RPMFILE_DOC);
+    REGISTER_ENUM(RPMFILE_ICON);
     REGISTER_ENUM(RPMFILE_MISSINGOK);
     REGISTER_ENUM(RPMFILE_NOREPLACE);
     REGISTER_ENUM(RPMFILE_GHOST);
     REGISTER_ENUM(RPMFILE_LICENSE);
     REGISTER_ENUM(RPMFILE_README);
+    REGISTER_ENUM(RPMFILE_EXCLUDE);
+    REGISTER_ENUM(RPMFILE_UNPATCHED);
+    REGISTER_ENUM(RPMFILE_PUBKEY);
 
     REGISTER_ENUM(RPMDEP_SENSE_REQUIRES);
     REGISTER_ENUM(RPMDEP_SENSE_CONFLICTS);
@@ -493,6 +497,7 @@ void initrpm(void)
     REGISTER_ENUM(RPMSENSE_TRIGGERPREIN);
     REGISTER_ENUM(RPMSENSE_KEYRING);
     REGISTER_ENUM(RPMSENSE_PATCHES);
+    REGISTER_ENUM(RPMSENSE_CONFIG);
 
     REGISTER_ENUM(RPMTRANS_FLAG_TEST);
     REGISTER_ENUM(RPMTRANS_FLAG_BUILD_PROBS);
@@ -504,8 +509,10 @@ void initrpm(void)
     REGISTER_ENUM(RPMTRANS_FLAG_KEEPOBSOLETE);
     REGISTER_ENUM(RPMTRANS_FLAG_MULTILIB);
     REGISTER_ENUM(RPMTRANS_FLAG_REPACKAGE);
+    REGISTER_ENUM(RPMTRANS_FLAG_REVERSE);
     REGISTER_ENUM(RPMTRANS_FLAG_NOPRE);
     REGISTER_ENUM(RPMTRANS_FLAG_NOPOST);
+    REGISTER_ENUM(RPMTRANS_FLAG_NOTRIGGERPREIN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOTRIGGERIN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOTRIGGERUN);
     REGISTER_ENUM(RPMTRANS_FLAG_NOPREUN);
@@ -515,7 +522,7 @@ void initrpm(void)
     REGISTER_ENUM(RPMTRANS_FLAG_NOMD5);
     REGISTER_ENUM(RPMTRANS_FLAG_NOSUGGEST);
     REGISTER_ENUM(RPMTRANS_FLAG_ADDINDEPS);
-    REGISTER_ENUM(RPMTRANS_FLAG_REVERSE);
+    REGISTER_ENUM(RPMTRANS_FLAG_NOCONFIGS);
 
     REGISTER_ENUM(RPMPROB_FILTER_IGNOREOS);
     REGISTER_ENUM(RPMPROB_FILTER_IGNOREARCH);

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 6e79630..20a7f3a 100644 (file)
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I. \
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
-       fts.h \
+       argv.h fts.h \
        rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
        ugid.h
 noinst_HEADERS = rpmio_internal.h
@@ -24,7 +24,8 @@ BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
 
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = librpmio.la
-librpmio_la_SOURCES = digest.c fts.c macro.c \
+librpmio_la_SOURCES = \
+       argv.c digest.c fts.c macro.c \
        rpmio.c rpmlog.c rpmmalloc.c \
        rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
 librpmio_la_LDFLAGS = -release @VERSION@ \

diff --git a/build/argv.c b/rpmio/argv.c
similarity index 98%
rename from build/argv.c
rename to rpmio/argv.c
index 9156133..b29468f 100644 (file)
--- a/build/argv.c
+++ b/rpmio/argv.c
@@ -1,3 +1,7 @@
+/** \ingroup rpmio
+ * \file rpmio/argv.c
+ */
+
 #include "system.h"
 
 #include <argv.h>

diff --git a/build/argv.h b/rpmio/argv.h
similarity index 86%
rename from build/argv.h
rename to rpmio/argv.h
index eb74c28..202aa46 100644 (file)
--- a/build/argv.h
+++ b/rpmio/argv.h
@@ -1,8 +1,8 @@
 #ifndef _H_ARGV_
 #define        _H_ARGV_
 
-/** \ingroup rpmbuild
- * \file build/argv.h
+/** \ingroup rpmio
+ * \file rpmio/argv.h
  */
 
 typedef        const char * ARGstr_t;
@@ -95,6 +95,8 @@ int argvCmp(const void * a, const void * b)
 /**
  * Sort an argv array.
  * @param argv         argv array
+ * @param compar       strcmp-like comparison function, or NULL for argvCmp()
+ * @return             0 always
  */
 int argvSort(ARGV_t argv, int (*compar)(const void *, const void *))
        /*@modifies *argv @*/;
@@ -102,6 +104,9 @@ int argvSort(ARGV_t argv, int (*compar)(const void *, const void *))
 /**
  * Find an element in an argv array.
  * @param argv         argv array
+ * @param val          string to find
+ * @param compar       strcmp-like comparison function, or NULL for argvCmp()
+ * @return             found string (NULL on failure)
  */
 /*@dependent@*/ /*@null@*/
 ARGV_t argvSearch(ARGV_t argv, ARGstr_t val,
@@ -111,7 +116,7 @@ ARGV_t argvSearch(ARGV_t argv, ARGstr_t val,
 /**
  * Add an int to an argi array.
  * @retval *argip      argi array
- * @parm ix            argi array index (or -1 to append)
+ * @param ix           argi array index (or -1 to append)
  * @param val          int arg to add
  * @return             0 always
  */
@@ -137,8 +142,11 @@ int argvAppend(/*@out@*/ ARGV_t * argvp, const ARGV_t av)
        /*@modifies *argvp @*/;
 
 /**
- * Splint a string into an argv array.
+ * Split a string into an argv array.
  * @retval *argvp      argv array
+ * @param str          string arg to split
+ * @param seps         seperator characters
+ * @return             0 always
  */
 int argvSplit(ARGV_t * argvp, const char * str, const char * seps)
        /*@modifies *argvp @*/;