From 292b9f10befbeb1044d2db98f62de0e65aff3317 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 12 Dec 1999 17:46:22 +0000 Subject: [PATCH] lib/rpminstall.c: Perform glob on remote ftp install args. lib/misc.[ch]: Rename remoteGlob to rpmGlob. Preserve glob_error behavior. build/files.c: Ditto. lib/rpmio.c: Collapse ftpFileDesc() into ftpReq(). lib/rpmio.c: Eliminate all uses of u->path. lib/url.c: Ditto. lib/url.c: Tweak url cache code to reuse empty slots (never happens). CVS patchset: 3478 CVS date: 1999/12/12 17:46:22 --- CHANGES | 3 +- build/files.c | 7 +- lib/misc.c | 13 +++- lib/misc.h | 2 +- lib/query.c | 90 +++++++++++------------ lib/rpminstall.c | 187 +++++++++++++++++++++++++---------------------- lib/url.c | 52 +++++++++++-- po/cs.po | 89 +++++++++++----------- po/de.po | 89 +++++++++++----------- po/fi.po | 89 +++++++++++----------- po/fr.po | 89 +++++++++++----------- po/pl.po | 89 +++++++++++----------- po/pt_BR.po | 89 +++++++++++----------- po/rpm.pot | 89 +++++++++++----------- po/ru.po | 89 +++++++++++----------- po/sk.po | 89 +++++++++++----------- po/sr.po | 89 +++++++++++----------- po/sv.po | 89 +++++++++++----------- po/tr.po | 89 +++++++++++----------- rpm.spec | 2 +- 20 files changed, 769 insertions(+), 655 deletions(-) diff --git a/CHANGES b/CHANGES index febe29bfe..5dc77d590 100644 --- a/CHANGES +++ b/CHANGES @@ -18,8 +18,9 @@ - fix: don't look at password when searching urlCache. - add contentLength sanity check on rpmdb headerWrite. - fix: fprint abort on stat("/", ...) in empty chroots. - - perform glob on remote ftp queries. + - perform glob on remote ftp query args. - fix: ftpAbort must close the data channel to read abort status. + - perform glob on remote ftp install args. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. diff --git a/build/files.c b/build/files.c index 933fab634..4d26a0d43 100644 --- a/build/files.c +++ b/build/files.c @@ -1067,11 +1067,6 @@ fprintf(stderr, "*** AF SAVE buildRootURL %s fileURL %s diskURL %s\n", fl->build return 0; } -static int glob_error(/*@unused@*/const char *foo, /*@unused@*/int bar) -{ - return 1; -} - static int processBinaryFile(/*@unused@*/Package pkg, struct FileList *fl, const char *fileURL) { @@ -1161,7 +1156,7 @@ fprintf(stderr, "*** GLOB maxb %d diskURL %d %*s globURL %p %s\n", maxb, nb, nb, #else int argc = 0; const char ** argv = NULL; - rc = remoteGlob(diskURL, &argc, &argv); + rc = rpmGlob(diskURL, &argc, &argv); if (rc == 0) { for (i = 0; i < argc; i++) { rc = addFile(fl, argv[i], NULL); diff --git a/lib/misc.c b/lib/misc.c index fb2886413..e5053c156 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -649,7 +649,12 @@ int myGlobPatternP (const char *patternURL) return (0); } -int remoteGlob(const char * patterns, int * argcPtr, const char *** argvPtr) +static int glob_error(/*@unused@*/const char *foo, /*@unused@*/int bar) +{ + return 1; +} + +int rpmGlob(const char * patterns, int * argcPtr, const char *** argvPtr) { int ac = 0; const char ** av = NULL; @@ -675,14 +680,14 @@ int remoteGlob(const char * patterns, int * argcPtr, const char *** argvPtr) else argv = xrealloc(argv, (argc+2) * sizeof(*argv)); if (_debug) -fprintf(stderr, "*** remoteGlob argv[%d] \"%s\"\n", argc, av[j]); +fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, av[j]); argv[argc++] = xstrdup(av[j]); continue; } gl.gl_pathc = 0; gl.gl_pathv = NULL; - rc = Glob(av[j], 0, NULL, &gl); + rc = Glob(av[j], 0, glob_error, &gl); if (rc) goto exit; @@ -724,7 +729,7 @@ fprintf(stderr, "*** GLOB maxb %d diskURL %d %*s globURL %p %s\n", maxb, nb, nb, while (*globFile == '/') globFile++; strcpy(globRoot, globFile); if (_debug) -fprintf(stderr, "*** remoteGlob argv[%d] \"%s\"\n", argc, globURL); +fprintf(stderr, "*** rpmGlob argv[%d] \"%s\"\n", argc, globURL); argv[argc++] = xstrdup(globURL); } Globfree(&gl); diff --git a/lib/misc.h b/lib/misc.h index 70cee1f95..b4f15c71c 100644 --- a/lib/misc.h +++ b/lib/misc.h @@ -41,7 +41,7 @@ void buildOrigFileList(Header h, /*@out@*/ const char *** fileListPtr, /*@out@*/ int * fileCountPtr); int myGlobPatternP (const char *patternURL); -int remoteGlob(const char * patterns, int * argcPtr, const char *** argvPtr); +int rpmGlob(const char * patterns, int * argcPtr, const char *** argvPtr); #ifdef __cplusplus } diff --git a/lib/query.c b/lib/query.c index 91ee65e8f..5e06fdfdb 100644 --- a/lib/query.c +++ b/lib/query.c @@ -454,61 +454,61 @@ int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg, int retcode = 0; char *end = NULL; - switch (source) { + switch (source) { case RPMQV_RPM: - { int argc = 0; - const char ** argv = NULL; - int i; + { int argc = 0; + const char ** argv = NULL; + int i; - rc = remoteGlob(arg, &argc, &argv); - if (rc) - return 1; - for (i = 0; i < argc; i++) { - FD_t fd; - fd = Fopen(argv[i], "r.ufdio"); - if (Ferror(fd)) { - /* XXX Fstrerror */ - fprintf(stderr, _("open of %s failed: %s\n"), argv[i], + rc = rpmGlob(arg, &argc, &argv); + if (rc) + return 1; + for (i = 0; i < argc; i++) { + FD_t fd; + fd = Fopen(argv[i], "r.ufdio"); + if (Ferror(fd)) { + /* XXX Fstrerror */ + fprintf(stderr, _("open of %s failed: %s\n"), argv[i], #ifndef NOTYET urlStrerror(argv[i])); #else Fstrerror(fd)); #endif - if (fd) - Fclose(fd); - retcode = 1; - break; - } - - retcode = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL); - - Fclose(fd); - - switch (retcode) { - case 0: - if (h == NULL) { - fprintf(stderr, _("old format source packages cannot " - "be queried\n")); + if (fd) Fclose(fd); + retcode = 1; + break; + } + + retcode = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL); + + Fclose(fd); + + switch (retcode) { + case 0: + if (h == NULL) { + fprintf(stderr, _("old format source packages cannot " + "be queried\n")); + retcode = 1; + break; + } + retcode = showPackage(qva, db, h); + headerFree(h); + break; + case 1: + fprintf(stderr, _("%s does not appear to be a RPM package\n"), + argv[i]); + /*@fallthrough@*/ + case 2: + fprintf(stderr, _("query of %s failed\n"), argv[i]); retcode = 1; break; } - retcode = showPackage(qva, db, h); - headerFree(h); - break; - case 1: - fprintf(stderr, _("%s does not appear to be a RPM package\n"), argv[i]); - /*@fallthrough@*/ - case 2: - fprintf(stderr, _("query of %s failed\n"), argv[i]); - retcode = 1; - break; } - } - if (argv) { - for (i = 0; i < argc; i++) - xfree(argv[i]); - xfree(argv); - } + if (argv) { + for (i = 0; i < argc; i++) + xfree(argv[i]); + xfree(argv); + } } break; case RPMQV_SPECFILE: @@ -658,7 +658,7 @@ int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg, dbiFreeIndexRecord(matches); } break; - } + } return retcode; } diff --git a/lib/rpminstall.c b/lib/rpminstall.c index 3dc5f731c..769f9c165 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -4,6 +4,8 @@ #include #include +#include "misc.h" + static int hashesPrinted = 0; static void printHash(const unsigned long amount, const unsigned long total) { @@ -88,7 +90,7 @@ static void * showProgress(const Header h, const rpmCallbackType what, return rc; } -int rpmInstall(const char * rootdir, const char ** argv, int transFlags, +int rpmInstall(const char * rootdir, const char ** fileArgv, int transFlags, int interfaceFlags, int probFilter, rpmRelocation * relocations) { @@ -96,17 +98,17 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, FD_t fd; int i; int mode, rc, major; - const char ** pkgURL, ** tmppkgURL; + const char ** pkgURL = NULL; + const char ** tmppkgURL = NULL; const char ** fileURL; - int numPackages; - int numTmpPackages = 0, numBinaryPackages = 0, numSourcePackages = 0; + int numPkgs; + int numTmpPkgs = 0, numRPMS = 0, numSRPMS = 0; int numFailed = 0; Header h; int isSource; rpmTransactionSet rpmdep = NULL; int numConflicts; int stopInstall = 0; - size_t nb; int notifyFlags = interfaceFlags | (rpmIsVerbose() ? INSTALL_LABEL : 0 ); int dbIsOpen = 0; const char ** sourceURL; @@ -122,74 +124,72 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, if (defaultReloc && !defaultReloc->newPath) defaultReloc = NULL; rpmMessage(RPMMESS_DEBUG, _("counting packages to install\n")); - for (fileURL = argv, numPackages = 0; *fileURL; fileURL++, numPackages++) + for (fileURL = fileArgv, numPkgs = 0; *fileURL; fileURL++, numPkgs++) ; - rpmMessage(RPMMESS_DEBUG, _("found %d packages\n"), numPackages); + rpmMessage(RPMMESS_DEBUG, _("found %d packages\n"), numPkgs); - nb = (numPackages + 1) * sizeof(char *); - pkgURL = alloca(nb); - memset(pkgURL, 0, nb); - tmppkgURL = alloca(nb); - memset(tmppkgURL, 0, nb); - nb = (numPackages + 1) * sizeof(Header); + pkgURL = xcalloc( (numPkgs + 1), sizeof(*pkgURL) ); + tmppkgURL = xcalloc( (numPkgs + 1), sizeof(*tmppkgURL) ); rpmMessage(RPMMESS_DEBUG, _("looking for packages to download\n")); - for (fileURL = argv, i = 0; *fileURL; fileURL++) { + for (fileURL = fileArgv, i = 0; *fileURL; fileURL++) { switch (urlIsURL(*fileURL)) { case URL_IS_FTP: case URL_IS_HTTP: { int myrc; + int j; const char *tfn; + const char ** argv; + int argc; - if (rpmIsVerbose()) - fprintf(stdout, _("Retrieving %s\n"), *fileURL); - -#ifdef DYING - { char tfnbuf[64]; - const char * tempfn; - strcpy(tfnbuf, "rpm-xfer.XXXXXX"); - /* XXX watchout for rootdir = NULL */ - tfn = tempfn = rpmGetPath("%{_tmppath}/", mktemp(tfnbuf), NULL); - switch(urlIsURL(tempfn)) { - case URL_IS_FTP: - case URL_IS_HTTP: - case URL_IS_DASH: - break; - case URL_IS_PATH: - tfn += sizeof("file://") - 1; - tfn = strchr(tfn, '/'); - /*@fallthrough@*/ - case URL_IS_UNKNOWN: - if (rootdir && rootdir[strlen(rootdir) - 1] == '/') - while (*tfn == '/') tfn++; - tfn = rpmGetPath( (rootdir ? rootdir : ""), tfn, NULL); - xfree(tempfn); - break; - } - } -#else - { char tfnbuf[64]; - strcpy(tfnbuf, "rpm-xfer.XXXXXX"); - /*@-unrecog@*/ mktemp(tfnbuf) /*@=unrecog@*/; - tfn = rpmGenPath(rootdir, "%{_tmppath}/", tfnbuf); - } -#endif - - /* XXX undefined %{name}/%{version}/%{release} here */ - /* XXX %{_tmpdir} does not exist */ - rpmMessage(RPMMESS_DEBUG, _(" ... as %s\n"), tfn); - myrc = urlGetFile(*fileURL, tfn); - if (myrc < 0) { + myrc = rpmGlob(*fileURL, &argc, &argv); + if (myrc) { rpmMessage(RPMMESS_ERROR, - _("skipping %s - transfer failed - %s\n"), - *fileURL, ftpStrerror(myrc)); + _("skipping %s - rpmGlob failed(%d)\n"), + *fileURL, myrc); numFailed++; pkgURL[i] = NULL; - xfree(tfn); - } else { - tmppkgURL[numTmpPackages++] = pkgURL[i++] = tfn; + break; + } + if (argc > 1) { + numPkgs += argc - 1; + pkgURL = xrealloc(pkgURL, (numPkgs + 1) * sizeof(*pkgURL)); + tmppkgURL = xrealloc(tmppkgURL, (numPkgs + 1) * sizeof(*tmppkgURL)); + } + + for (j = 0; j < argc; j++) { + + if (rpmIsVerbose()) + fprintf(stdout, _("Retrieving %s\n"), argv[j]); + + { char tfnbuf[64]; + strcpy(tfnbuf, "rpm-xfer.XXXXXX"); + /*@-unrecog@*/ mktemp(tfnbuf) /*@=unrecog@*/; + tfn = rpmGenPath(rootdir, "%{_tmppath}/", tfnbuf); + } + + /* XXX undefined %{name}/%{version}/%{release} here */ + /* XXX %{_tmpdir} does not exist */ + rpmMessage(RPMMESS_DEBUG, _(" ... as %s\n"), tfn); + myrc = urlGetFile(argv[j], tfn); + if (myrc < 0) { + rpmMessage(RPMMESS_ERROR, + _("skipping %s - transfer failed - %s\n"), + argv[j], ftpStrerror(myrc)); + numFailed++; + pkgURL[i] = NULL; + xfree(tfn); + } else { + tmppkgURL[numTmpPkgs++] = pkgURL[i++] = tfn; + } + } + if (argv) { + for (j = 0; j < argc; j++) + xfree(argv[j]); + xfree(argv); + argv = NULL; } } break; case URL_IS_PATH: @@ -201,7 +201,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, sourceURL = alloca(sizeof(*sourceURL) * i); - rpmMessage(RPMMESS_DEBUG, _("retrieved %d packages\n"), numTmpPackages); + rpmMessage(RPMMESS_DEBUG, _("retrieved %d packages\n"), numTmpPkgs); /* Build up the transaction set. As a special case, v1 source packages are installed right here, only because they don't have headers and @@ -211,9 +211,10 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, const char * fileName; (void) urlPath(*fileURL, &fileName); fd = Fopen(*fileURL, "r.ufdio"); - if (Ferror(fd)) { + if (fd == NULL || Ferror(fd)) { rpmMessage(RPMMESS_ERROR, _("cannot open file %s: %s\n"), *fileURL, Fstrerror(fd)); + if (fd) Fclose(fd); numFailed++; pkgURL[i] = NULL; continue; @@ -235,7 +236,7 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, break; case 0: if (isSource) { - sourceURL[numSourcePackages++] = fileName; + sourceURL[numSRPMS++] = fileName; Fclose(fd); } else { if (!dbIsOpen) { @@ -253,21 +254,21 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, } if (defaultReloc) { - char ** paths; - char * name; + const char ** paths; int c; if (headerGetEntry(h, RPMTAG_PREFIXES, NULL, (void **) &paths, &c) && (c == 1)) { defaultReloc->oldPath = xstrdup(paths[0]); - free(paths); + xfree(paths); } else { - headerGetEntry(h, RPMTAG_NAME, NULL, (void **) &name, - NULL); + const char * name; + headerNVR(h, &name, NULL, NULL); rpmMessage(RPMMESS_ERROR, _("package %s is not relocateable\n"), name); - return numPackages; + goto errxit; + /*@notreached@*/ } } @@ -284,13 +285,13 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, case 1: rpmMessage(RPMMESS_ERROR, _("error reading from file %s\n"), *fileURL); - return numPackages; + goto errxit; /*@notreached@*/ break; case 2: rpmMessage(RPMMESS_ERROR, _("file %s requires a newer version of RPM\n"), *fileURL); - return numPackages; + goto errxit; /*@notreached@*/ break; } @@ -299,19 +300,19 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, defaultReloc->oldPath = NULL; } - numBinaryPackages++; + numRPMS++; } break; } } rpmMessage(RPMMESS_DEBUG, _("found %d source and %d binary packages\n"), - numSourcePackages, numBinaryPackages); + numSRPMS, numRPMS); - if (numBinaryPackages && !(interfaceFlags & INSTALL_NODEPS)) { + if (numRPMS && !(interfaceFlags & INSTALL_NODEPS)) { struct rpmDependencyConflict * conflicts; if (rpmdepCheck(rpmdep, &conflicts, &numConflicts)) { - numFailed = numPackages; + numFailed = numPkgs; stopInstall = 1; } @@ -319,19 +320,19 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n")); printDepProblems(stderr, conflicts, numConflicts); rpmdepFreeConflicts(conflicts, numConflicts); - numFailed = numPackages; + numFailed = numPkgs; stopInstall = 1; } } - if (numBinaryPackages && !(interfaceFlags & INSTALL_NOORDER)) { + if (numRPMS && !(interfaceFlags & INSTALL_NOORDER)) { if (rpmdepOrder(rpmdep)) { - numFailed = numPackages; + numFailed = numPkgs; stopInstall = 1; } } - if (numBinaryPackages && !stopInstall) { + if (numRPMS && !stopInstall) { rpmProblemSet probs = NULL; ; rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); @@ -339,8 +340,8 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, NULL, &probs, transFlags, probFilter); if (rc < 0) { - numFailed += numBinaryPackages; - } else if (rc) { + numFailed += numRPMS; + } else if (rc > 0) { numFailed += rc; rpmProblemSetPrint(stderr, probs); } @@ -348,14 +349,15 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, if (probs) rpmProblemSetFree(probs); } - if (numBinaryPackages) rpmtransFree(rpmdep); + if (numRPMS) rpmtransFree(rpmdep); - if (numSourcePackages && !stopInstall) { - for (i = 0; i < numSourcePackages; i++) { + if (numSRPMS && !stopInstall) { + for (i = 0; i < numSRPMS; i++) { fd = Fopen(sourceURL[i], "r.ufdio"); - if (Ferror(fd)) { + if (fd == NULL || Ferror(fd)) { rpmMessage(RPMMESS_ERROR, _("cannot open file %s: %s\n"), sourceURL[i], Fstrerror(fd)); + if (fd) Fclose(fd); continue; } @@ -367,16 +369,29 @@ int rpmInstall(const char * rootdir, const char ** argv, int transFlags, } } - for (i = 0; i < numTmpPackages; i++) { + for (i = 0; i < numTmpPkgs; i++) { Unlink(tmppkgURL[i]); xfree(tmppkgURL[i]); } + xfree(tmppkgURL); + xfree(pkgURL); /* FIXME how do we close our various fd's? */ if (dbIsOpen) rpmdbClose(db); return numFailed; + +errxit: + if (tmppkgURL) { + for (i = 0; i < numTmpPkgs; i++) + xfree(tmppkgURL[i]); + xfree(tmppkgURL); + } + if (pkgURL) + xfree(pkgURL); + if (dbIsOpen) rpmdbClose(db); + return numPkgs; } int rpmErase(const char * rootdir, const char ** argv, int transFlags, @@ -480,9 +495,9 @@ int rpmInstallSource(const char * rootdir, const char * arg, const char ** specF int rc; fd = Fopen(arg, "r.ufdio"); - if (Ferror(fd)) { + if (fd == NULL || Ferror(fd)) { rpmMessage(RPMMESS_ERROR, _("cannot open %s: %s\n"), arg, Fstrerror(fd)); - Fclose(fd); + if (fd) Fclose(fd); return 1; } diff --git a/lib/url.c b/lib/url.c index 6276c1513..c61bc547d 100644 --- a/lib/url.c +++ b/lib/url.c @@ -112,7 +112,9 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li FREE(u->password); FREE(u->host); FREE(u->portstr); +#ifdef DYING FREE(u->path); +#endif FREE(u->proxyu); FREE(u->proxyh); @@ -190,9 +192,10 @@ static void urlFind(urlinfo *uret, int mustAsk) else uCache = xmalloc(sizeof(*uCache)); } - uCache[i] = urlLink(u, "uCache (miss)"); + uCache[ucx] = urlLink(u, "uCache (miss)"); u = urlFree(u, "urlSplit (urlFind miss)"); } else { +#ifdef DYING /* XXX Swap original url and path into the cached structure */ const char *up = uCache[i]->path; ucx = i; @@ -201,12 +204,15 @@ static void urlFind(urlinfo *uret, int mustAsk) up = uCache[ucx]->url; uCache[ucx]->url = u->url; u->url = up; +#else + ucx = i; +#endif u = urlFree(u, "urlSplit (urlFind hit)"); } /* This URL is now cached. */ - u = urlLink(uCache[i], "uCache"); + u = urlLink(uCache[ucx], "uCache"); *uret = u; u = urlFree(u, "uCache (urlFind)"); @@ -378,7 +384,9 @@ int urlSplit(const char * url, urlinfo *uret) } /* Item was everything-but-path. Save path and continue parse on rest */ +#ifdef DYING u->path = xstrdup((*se ? se : "/")); +#endif *se = '\0'; break; } @@ -440,15 +448,27 @@ int urlGetFile(const char * url, const char * dest) { int rc; FD_t sfd = NULL; FD_t tfd = NULL; - urlinfo sfu; + const char * sfuPath = NULL; + int urlType = urlPath(url, &sfuPath); + if (*sfuPath == '\0') + return FTPERR_UNKNOWN; + sfd = Fopen(url, "r.ufdio"); if (sfd == NULL || Ferror(sfd)) { rpmMessage(RPMMESS_DEBUG, _("failed to open %s: %s\n"), url, Fstrerror(sfd)); - Fclose(sfd); +#ifdef DYING + if (sfd) + Fclose(sfd); return FTPERR_UNKNOWN; +#else + rc = FTPERR_UNKNOWN; + goto exit; +#endif } +#ifdef DYING + { urlinfo sfu; sfu = ufdGetUrlinfo(sfd); if (sfu != NULL && dest == NULL) { const char *fileName = sfu->path; @@ -461,6 +481,15 @@ int urlGetFile(const char * url, const char * dest) { (void) urlFree(sfu, "ufdGetUrlinfo (urlGetFile)"); sfu = NULL; } + } +#else + if (dest == NULL) { + if ((dest = strrchr(sfuPath, '/')) != NULL) + dest++; + else + dest = sfuPath; + } +#endif tfd = Fopen(dest, "w.ufdio"); if (_url_debug) @@ -468,14 +497,19 @@ fprintf(stderr, "*** urlGetFile sfd %p %s tfd %p %s\n", sfd, url, tfd, dest); if (tfd == NULL || Ferror(tfd)) { /* XXX Fstrerror */ rpmMessage(RPMMESS_DEBUG, _("failed to create %s: %s\n"), dest, Fstrerror(tfd)); +#ifdef DYING if (tfd) Fclose(tfd); if (sfd) Fclose(sfd); return FTPERR_UNKNOWN; +#else + rc = FTPERR_UNKNOWN; + goto exit; +#endif } - switch (urlIsURL(url)) { + switch (urlType) { case URL_IS_FTP: case URL_IS_HTTP: case URL_IS_PATH: @@ -486,14 +520,18 @@ fprintf(stderr, "*** urlGetFile sfd %p %s tfd %p %s\n", sfd, url, tfd, dest); /* XXX FIXME: sfd possibly closed by copyData */ /*@-usereleased@*/ Fclose(sfd) /*@=usereleased@*/ ; } - /* XXX Fclose(sfd) done by ufdCopy */ + sfd = NULL; /* XXX Fclose(sfd) done by ufdGetFile */ break; default: rc = FTPERR_UNKNOWN; break; } - Fclose(tfd); +exit: + if (tfd) + Fclose(tfd); + if (sfd) + Fclose(sfd); return rc; } diff --git a/po/cs.po b/po/cs.po index 6b8a372ff..3f2af9334 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: 1998-10-10 10:10+0200\n" "Last-Translator: Pavel Makovec \n" "Language-Team: Czech \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "chyba: nelze otevøít %s%s/packages.rpm\n" @@ -1511,63 +1511,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "soubor %s: %s\n" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Soubor nebyl na serveru nalezen" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "chyba: nelze otevøít soubor %s\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nelze spustit pgp" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nelze naèíst cílpodpisu" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "chyba pgp" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s nelze vytvoøit\n" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "soubor %s: %s\n" @@ -2665,11 +2665,11 @@ msgstr "chyba: nelze na msgid "open of %s failed: %s\n" msgstr "nelze otevøít %s: %s\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "na zdrojové balíèky starého formátu se nelze dotazovat\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "nezdá se, ¾e by %s byl balíèek typu RPM\n" @@ -2733,7 +2733,7 @@ msgstr "prob msgid "record %d could not be read\n" msgstr "záznam %d nelze naèíst\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "balíèek %s není nainstalován\n" @@ -2970,7 +2970,7 @@ msgstr "OK" msgid "opening database mode 0x%x in %s\n" msgstr "probíhá otevírání databázového re¾imu: 0%o\n" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nelze otevøít %s: %s" @@ -3067,32 +3067,37 @@ msgstr "nelze msgid "header changed size!" msgstr "hlavièka zmìnila velikost!" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 msgid "counting packages to install\n" msgstr "probíhá poèítání balíèkù pro instalaci\n" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "nalezeno %d balíèkù\n" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "probíhá hledání balíèkù pro sta¾ení\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "chyba: vynechává se %s - pøenos neúspì¹ný - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "Probíhá naèítání %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "chyba: vynechává se %s - pøenos neúspì¹ný - %s\n" @@ -3102,12 +3107,12 @@ msgstr "chyba: vynech msgid "retrieved %d packages\n" msgstr "získalo se %d balíèkù\n" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nelze otevøít soubor %s: " -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "chyba: %s nelze nainstalovat\n" @@ -3117,49 +3122,49 @@ msgstr "chyba: %s nelze nainstalovat\n" msgid "package %s is not relocateable\n" msgstr "balíèek %s není nainstalován\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pøi vytváøení adresáøe %s: %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nalezeno %d zdrojových a %d binárních balíèkù\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "chybné závislosti:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "probíhá instalace binárních balíèkù\n" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "chyba pøi hledání balíèku %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" specifikuje více balíèkù\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "chyba: nelze otevøít %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "Probíhá instalace %s\n" @@ -3224,7 +3229,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "Neznámá nebo neèekaná chyba FTP" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "probíhá pøihla¹ování na %s jako %s, h. %s\n" @@ -3541,28 +3546,28 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pro %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "chyba: ftpport musí být èíslo\n" -#: lib/url.c:411 +#: lib/url.c:419 #, fuzzy msgid "url port must be a number\n" msgstr "chyba: ftpport musí být èíslo\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s nelze vytvoøit\n" diff --git a/po/de.po b/po/de.po index 85e91d51f..1913f12a2 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.5.2\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" @@ -45,7 +45,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n" @@ -1590,66 +1590,66 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Fehler: kann Datei %s nicht öffnen\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -2777,11 +2777,11 @@ msgstr "Fehler: konnte Datenbank-Eintrag nicht lesen\n" msgid "open of %s failed: %s\n" msgstr "öffnen von %s fehlgeschlagen: %s\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s scheint kein RPM-Paket zu sein\n" @@ -2847,7 +2847,7 @@ msgstr "ung msgid "record %d could not be read\n" msgstr "Eintrag %d konnte nicht gelesen werden\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "Paket %s ist nicht installiert\n" @@ -3087,7 +3087,7 @@ msgid "opening database mode 0x%x in %s\n" msgstr "Datenbank aus der vorhandenen neu erstellen" # , c-format -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" @@ -3190,35 +3190,40 @@ msgstr "kann Kopfzeilen bei %d nicht lesen, um Update durchzuf msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "Es wurden keine Pakete für die Installation angegeben" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, fuzzy, c-format msgid "found %d packages\n" msgstr "Anfrage an alle Pakete" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 #, fuzzy msgid "looking for packages to download\n" msgstr "Fehler beim Suchen nach Paket %s\n" +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" + # , c-format -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "Hole %s heraus\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n" @@ -3228,12 +3233,12 @@ msgstr "Fehler: msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kann Datei %s nicht öffnen: " -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "Fehler: %s kann nicht installiert werden\n" @@ -3243,51 +3248,51 @@ msgstr "Fehler: %s kann nicht installiert werden\n" msgid "package %s is not relocateable\n" msgstr "Paket %s ist nicht installiert\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "Gruppe %s beinhaltet kein einziges Paket\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr "Paket installieren" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "Fehler beim Suchen nach Paket %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" bezeichnet mehrere Pakete\n" # oder besser: "... verletzen" ? -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Fehler: kann %s nicht öffnen\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "Installiere %s\n" @@ -3352,7 +3357,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "FTP Unbekannter oder nicht erwarteter Fehler" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3677,29 +3682,29 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "Passworf für %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" -#: lib/url.c:411 +#: lib/url.c:419 #, fuzzy msgid "url port must be a number\n" msgstr "Fehler: der FTP-Port muss eine Zahl sein\n" # , c-format #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "anlegen von %s fehlgeschlagen\n" diff --git a/po/fi.po b/po/fi.po index b5a1871a4..b3a0279d9 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" "Content-Type: text/plain; charset=\n" @@ -20,7 +20,7 @@ msgstr "" "/home/ewt/redhat/rpm/lib/package.c /home/ewt/redhat/rpm/lib/rpmlead.c " "/home/ewt/redhat/rpm/lib/rpmrc.c\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "virhe: en voi avata %s%s/packages.rpm\n" @@ -1549,63 +1549,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "virhe: tiedostoa %s ei voi avata\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "pgp epäonnistui" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -2703,11 +2703,11 @@ msgstr "virhe: tietokannan tietuetta ei voinut lukea\n" msgid "open of %s failed: %s\n" msgstr "%s:n avaus ei onnistunut: %s\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ei vaikuta RPM-paketilta\n" @@ -2771,7 +2771,7 @@ msgstr "virheellinen paketin numero: %s\n" msgid "record %d could not be read\n" msgstr "tietuetta %d ei voitu lukea\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "paketti %s ei ole asennettu\n" @@ -3008,7 +3008,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "en voinut avata %s: %s" @@ -3107,34 +3107,39 @@ msgstr "en voi lukea headeria %d:st msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "asennukselle ei määritelty paketteja" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, fuzzy, c-format msgid "found %d packages\n" msgstr "kysele kaikki paketit" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 #, fuzzy msgid "looking for packages to download\n" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "Haen: %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n" @@ -3144,12 +3149,12 @@ msgstr "virhe: ohitan %s:n, siirto ep msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "en voinut avata tiedostoa %s: " -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "virhe: %s ei voida asentaa\n" @@ -3159,50 +3164,50 @@ msgstr "virhe: %s ei voida asentaa\n" msgid "package %s is not relocateable\n" msgstr "paketti %s ei ole asennettu\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "virhe luotaessa hakemistoa %s: %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "ryhmässä %s ei ole paketteja\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "puuttuvat riippuvuudet:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr "asenna paketti" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "virhe etsittäessä pakettia %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" määrittää useita paketteja\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "virhe: en voi avata %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "Asennan: %s\n" @@ -3267,7 +3272,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "FTP:n tuntematon tai odottamaton virhe" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3588,28 +3593,28 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "%s@%s:n salasana: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" -#: lib/url.c:411 +#: lib/url.c:419 #, fuzzy msgid "url port must be a number\n" msgstr "virhe: ftpport pitää olla luku\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s:n luonti epäonnistui\n" diff --git a/po/fr.po b/po/fr.po index 65bf099f0..81ac2ba59 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ msgid "" -msgstr "POT-Creation-Date: 1999-12-11 20:34-0500\n" +msgstr "POT-Creation-Date: 1999-12-12 11:59-0500\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -1552,63 +1552,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "aucun package n'a été spécifié pour la désinstallation" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "La construction a échoué.\n" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:1940 +#: build/files.c:1935 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2703,11 +2703,11 @@ msgstr "" msgid "open of %s failed: %s\n" msgstr "La construction a échoué.\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -2771,7 +2771,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -3010,7 +3010,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" @@ -3109,33 +3109,38 @@ msgstr "" msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" @@ -3145,12 +3150,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "aucun package n'a été spécifié pour l'installation" @@ -3160,49 +3165,49 @@ msgstr "aucun package n'a msgid "package %s is not relocateable\n" msgstr "aucun package n'a été spécifié pour l'installation" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, c-format msgid "searching for package %s\n" msgstr "" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "" @@ -3259,7 +3264,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3574,27 +3579,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "impossible d'ouvrir: %s\n" diff --git a/po/pl.po b/po/pl.po index 30a50f299..d2e1d7f18 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm-3.0.2\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie mo¿na otworzyæ %s/packages.rpm\n" @@ -1472,63 +1472,63 @@ msgstr "B msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Plik %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "Plik musi siê zaczynaæ od \"/\": %s" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Nie mo¿na otworzyæ %%files pliku: %s" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "linia: %s" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "B³êdny u¿ytkownik/grupa: %s" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:1704 +#: build/files.c:1699 #, c-format msgid "%s failed" msgstr "%s nie powiod³o siê" -#: build/files.c:1708 +#: build/files.c:1703 #, c-format msgid "failed to write all data to %s" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:1797 +#: build/files.c:1792 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %s\n" @@ -2619,11 +2619,11 @@ msgstr "b msgid "open of %s failed: %s\n" msgstr "otwarcie %s nie powiod³o siê\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s nie wygl±da na pakiet RPM\n" @@ -2687,7 +2687,7 @@ msgstr "numer rekordu pakietu: %d\n" msgid "record %d could not be read\n" msgstr "nie mo¿na odczytaæ rekordu %d\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "pakiet %s nie jest zainstalowany\n" @@ -2910,7 +2910,7 @@ msgstr "OK" msgid "opening database mode 0x%x in %s\n" msgstr "otwiernie bazê danych w trybie 0x%x w %s\n" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nie mo¿na otworzyæ %s: %s" @@ -3009,32 +3009,37 @@ msgstr "nie mo msgid "header changed size!" msgstr "nag³ówek zmieni³ swój rozmiar!" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 msgid "counting packages to install\n" msgstr "zliczanie pakietów do zainstalowania\n" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "znaleziono %d pakietów\n" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "szukanie pakietów do ¶ci±gniêcia\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "¦ci±ganie %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "... jako %s\n" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s pomijany - transmisja %s nie powiod³a siê\n" @@ -3044,12 +3049,12 @@ msgstr "%s pomijany - transmisja %s nie powiod msgid "retrieved %d packages\n" msgstr "¶ci±gniêto %d pakietów\n" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie mo¿na otworzyæ pliku %s: %s" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie mo¿e byæ zainstalowany\n" @@ -3059,49 +3064,49 @@ msgstr "%s nie mo msgid "package %s is not relocateable\n" msgstr "pakiet %s nie jest przesuwalny\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "b³±d czytania z pliku %s\n" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "plik %s wymaga nowszej wersji RPM\n" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "znaleziono %d pakietów ¼ród³owych i %d binarnych\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "niespe³nione zale¿no¶ci:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "instalacja pakietów binarnych\n" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, c-format msgid "searching for package %s\n" msgstr "poszukiwanie pakietu %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" okre¶la wiele pakietów\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie mo¿na otworzyæ %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "Instalacja %s\n" @@ -3158,7 +3163,7 @@ msgstr "Przerywanie ..." msgid "Unknown or unexpected error" msgstr "Nieznany lub nieoczekiwany b³±d" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "logowanie do %s jako %s, has³o %s\n" @@ -3469,27 +3474,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "Has³o dla %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "b³±d: %sport musi byæ liczb±\n" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "port musi byæ liczb±\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "utworzenie %s nie powiod³o siê\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b822bfe18..2df3dcaeb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,9 +2,9 @@ # Revised by Arnaldo Carvalho de Melo , 1998. # msgid "" -msgstr "POT-Creation-Date: 1999-12-11 20:34-0500\n" +msgstr "POT-Creation-Date: 1999-12-12 11:59-0500\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -1587,68 +1587,68 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "não foi passado pacote para desinstalação" # , c-format -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "Não consegui abrir: %s\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" # , c-format #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Não consegui ler o arquivo spec de %s\n" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "Construção falhou.\n" # , c-format -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Não consegui abrir o pipe tar: %s\n" -#: build/files.c:1940 +#: build/files.c:1935 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2771,11 +2771,11 @@ msgstr "" msgid "open of %s failed: %s\n" msgstr "Construção falhou.\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -2839,7 +2839,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "não foi passado pacote para instalação" @@ -3080,7 +3080,7 @@ msgid "opening database mode 0x%x in %s\n" msgstr "reconstrua o banco de dados a partir de um banco de dados existente" # , c-format -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "Não consegui abrir: %s\n" @@ -3179,20 +3179,25 @@ msgstr "" msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "não foi passado pacote para instalação" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, fuzzy, c-format msgid "found %d packages\n" msgstr "pesquise todos os pacotes" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "" +#: lib/rpminstall.c:150 +#, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "" + # "Project-Id-Version: rpm-2.5.3\n" # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n" # "Last-Translator: Arnaldo Carvalho de Melo \n" @@ -3201,19 +3206,19 @@ msgstr "" # "Content-Type: text/plain; charset=ISO-8859-1\n" # "Content-Transfer-Encoding: 8-bit\n" # , c-format -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:165 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM versão %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" @@ -3224,12 +3229,12 @@ msgid "retrieved %d packages\n" msgstr "" # , c-format -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "não foi passado pacote para instalação" @@ -3239,53 +3244,53 @@ msgstr "n msgid "package %s is not relocateable\n" msgstr "não foi passado pacote para instalação" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 #, fuzzy msgid "failed dependencies:\n" msgstr "lista dependências do pacote" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr "instale pacote" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "instale pacote" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 #, fuzzy msgid "removing these packages would break dependencies:\n" msgstr "lista dependências do pacote" # , c-format -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "Não consegui abrir: %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "" @@ -3342,7 +3347,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3679,28 +3684,28 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "" # , c-format #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "Não consegui abrir o pipe tar: %s\n" diff --git a/po/rpm.pot b/po/rpm.pot index abb7507ba..f8b4af207 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -1407,62 +1407,62 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, c-format msgid "File not found by glob: %s" msgstr "" -#: build/files.c:1212 +#: build/files.c:1207 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1622 +#: build/files.c:1617 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1704 +#: build/files.c:1699 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1708 +#: build/files.c:1703 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1940 +#: build/files.c:1935 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2548,11 +2548,11 @@ msgstr "" msgid "open of %s failed: %s\n" msgstr "" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -2616,7 +2616,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "" @@ -2838,7 +2838,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -2935,32 +2935,37 @@ msgstr "" msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 msgid "counting packages to install\n" msgstr "" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" @@ -2970,12 +2975,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, c-format msgid "cannot open file %s: %s\n" msgstr "" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, c-format msgid "%s cannot be installed\n" msgstr "" @@ -2985,49 +2990,49 @@ msgstr "" msgid "package %s is not relocateable\n" msgstr "" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, c-format msgid "searching for package %s\n" msgstr "" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "" @@ -3084,7 +3089,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3393,27 +3398,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index a0669777e..763b30a1e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,13 +1,13 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" "Date: 1999-05-27 17:30:00+0300\n" "From: Sergey Kubushin \n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n" @@ -1480,63 +1480,63 @@ msgstr " msgid "File %4d: %07o %s.%s\t %s\n" msgstr "æÁÊÌ %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "æÁÊÌ ÄÏÌÖÅÎ ÎÁÞÉÎÁÔØÓÑ Ó \"/\": %s" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %%files: %s" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "ÓÔÒÏËÁ: %s" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ÈÏÚÑÉÎ/ÇÒÕÐÐÁ: %s" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "îÅ ÍÏÇÕ ÉÓÐÏÌÎÉÔØ %s" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "îÅ ÍÏÇÕ ÆÏÒËÎÕÔØ %s" -#: build/files.c:1704 +#: build/files.c:1699 #, c-format msgid "%s failed" msgstr "%s ÎÅ ÕÄÁÌÏÓØ" -#: build/files.c:1708 +#: build/files.c:1703 #, c-format msgid "failed to write all data to %s" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ" -#: build/files.c:1797 +#: build/files.c:1792 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "ïÐÒÅÄÅÌÑÀ ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ...\n" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "ïÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÓÅÒ×ÉÓÏ×, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÐÁËÅÔÏÍ" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀ ÆÁÊÌÙ: %s\n" @@ -2623,11 +2623,11 @@ msgstr " msgid "open of %s failed: %s\n" msgstr "ÏÔËÒÙÔÉÅ %s ÎÅ ÕÄÁÌÏÓØ\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "ÚÁÐÒÏÓÙ Ë SRPM × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ÎÅ ÐÏÈÏÖ ÎÁ ÐÁËÅÔ RPM...\n" @@ -2691,7 +2691,7 @@ msgstr " msgid "record %d could not be read\n" msgstr "ÚÁÐÉÓØ %d ÎÅ ÞÉÔÁÅÔÓÑ\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -2914,7 +2914,7 @@ msgstr "Ok" msgid "opening database mode 0x%x in %s\n" msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s" @@ -3013,32 +3013,37 @@ msgstr " msgid "header changed size!" msgstr "ÈÅÄÅÒ ÉÚÍÅÎÉÌ ÒÁÚÍÅÒ!" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 msgid "counting packages to install\n" msgstr "ÓÞÉÔÁÀ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ\n" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "ÉÝÕ ÐÁËÅÔÙ ÄÌÑ ÐÏÌÕÞÅÎÉÑ Ó ftp/http\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "ðÏÌÕÞÁÀ %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr " ... ËÁË %s\n" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "ÐÒÏÐÕÓËÁÀ %s - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n" @@ -3048,12 +3053,12 @@ msgstr " msgid "retrieved %d packages\n" msgstr "ÐÏÌÕÞÅÎÏ %d ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, c-format msgid "%s cannot be installed\n" msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n" @@ -3063,49 +3068,49 @@ msgstr "%s msgid "package %s is not relocateable\n" msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "ÆÁÊÌ %s ÔÒÅÂÕÅÔ ÂÏÌÅÅ ÎÏ×ÏÊ ×ÅÒÓÉÉ RPM\n" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, c-format msgid "searching for package %s\n" msgstr "ÉÝÕ ÐÁËÅÔ %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n" @@ -3162,7 +3167,7 @@ msgstr " msgid "Unknown or unexpected error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n" @@ -3476,27 +3481,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "ðÁÒÏÌØ ÄÌÑ %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "ÏÛÉÂËÁ: %sport ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "url port ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s\n" diff --git a/po/sk.po b/po/sk.po index 5fdb11e1c..743437ee2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 2.93\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "nie je mo¾né otvori» %s/packages.rpm\n" @@ -1484,63 +1484,63 @@ msgstr "Chybn msgid "File %4d: %07o %s.%s\t %s\n" msgstr "Súbor %4d: 0%o %s.%s\t %s\n" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "Súbor potrebuje na zaèiatku \"/\": %s" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "riadok: %s" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "Chybný vlastník/skupina: %s" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:1704 +#: build/files.c:1699 #, c-format msgid "%s failed" msgstr "%s zlyhalo" -#: build/files.c:1708 +#: build/files.c:1703 #, c-format msgid "failed to write all data to %s" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:1797 +#: build/files.c:1792 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" @@ -2627,11 +2627,11 @@ msgstr "chyba: nie je mo msgid "open of %s failed: %s\n" msgstr "otvorenie %s zlyhalo\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "nie je mo¾né pýta» sa zdrojových balíkov v starom formáte\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s zrejme nie je RPM balík\n" @@ -2695,7 +2695,7 @@ msgstr "po msgid "record %d could not be read\n" msgstr "záznam %d nie je mo¾né preèíta»\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "balík %s nie je nain¹talovaný\n" @@ -2919,7 +2919,7 @@ msgstr "V PORIADKU" msgid "opening database mode 0x%x in %s\n" msgstr "otvára sa databáza s právami 0x%x v %s\n" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "nepodarilo sa otvori» %s: %s" @@ -3018,32 +3018,37 @@ msgstr "nie je mo msgid "header changed size!" msgstr "zmenila sa veµkos» hlavièky!" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 msgid "counting packages to install\n" msgstr "poèítajú sa balíky pre in¹taláciu\n" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "nájdených %d balíkov\n" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "hµadajú sa balíky, ktoré treba prenies»\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "%s vynechané - prenos zlyhal - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "Prená¹a sa %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "... ako %s\n" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "%s vynechané - prenos zlyhal - %s\n" @@ -3053,12 +3058,12 @@ msgstr "%s vynechan msgid "retrieved %d packages\n" msgstr "prenieslo sa %d balíkov\n" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "nie je mo¾né otvori» súbor %s: %s" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, c-format msgid "%s cannot be installed\n" msgstr "%s nie je mo¾né nain¹talova»\n" @@ -3068,49 +3073,49 @@ msgstr "%s nie je mo msgid "package %s is not relocateable\n" msgstr "balík %s nie je nain¹talovaný\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "chyba pri vytváraní doèasného súboru %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "nájdených %d zdrojových a %d binárnych balíkov\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "nevyrie¹ené závislosti:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 msgid "installing binary packages\n" msgstr "in¹talujú sa binárne balíky\n" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, c-format msgid "searching for package %s\n" msgstr "vyhµadáva sa balík %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" ¹pecifikuje viac balíkov\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "nie je mo¾né otvori» %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "In¹taluje sa %s\n" @@ -3167,7 +3172,7 @@ msgstr "Zru msgid "Unknown or unexpected error" msgstr "Neznáma alebo neoèakávaná chyba" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "prihlasuje sa na %s ako %s, heslo %s\n" @@ -3478,27 +3483,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "Heslo pre %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "chyba: %sport musí by» èíslo\n" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "url port musí by» èíslo\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "nepodarilo sa vytvori» %s\n" diff --git a/po/sr.po b/po/sr.po index ff4ebe1de..d48ec9da0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" "From: Erik Troan \n" @@ -18,7 +18,7 @@ msgstr "" "/home/ewt/redhat/rpm/lib/package.c /home/ewt/redhat/rpm/lib/rpmlead.c " "/home/ewt/redhat/rpm/lib/rpmrc.c\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n" @@ -1510,63 +1510,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "PGP omanuo" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -2663,11 +2663,11 @@ msgstr "gre msgid "open of %s failed: %s\n" msgstr "neuspelo otvaranje %s: %s\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s ne lièi na RPM paket\n" @@ -2731,7 +2731,7 @@ msgstr "pogre msgid "record %d could not be read\n" msgstr "ne mogu da proèitam slog %d\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "paket %s nije instaliran\n" @@ -2968,7 +2968,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "rekreiraj bazu podataka iz postojeæe baze" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "neuspelo otvaranje %s: %s" @@ -3067,34 +3067,39 @@ msgstr "ne mogu da pro msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "nedostaje paket za instalaciju" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, fuzzy, c-format msgid "found %d packages\n" msgstr "upit nad svim paketima" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 #, fuzzy msgid "looking for packages to download\n" msgstr "gre¹ka kod potrage za paketom %s\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "Pribavljam %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n" @@ -3104,12 +3109,12 @@ msgstr "gre msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "Ne mogu da otvorim datoteku %s: " -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "gre¹ka: %s se ne mo¾e instalirati\n" @@ -3119,50 +3124,50 @@ msgstr "gre msgid "package %s is not relocateable\n" msgstr "paket %s nije instaliran\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "gre¹ka kod kreiranja direktorijuma %s: %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "grupa %s ne sadr¾i nijedan paket\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "lo¹e meðuzavisnosti:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr "instaliraj paket" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "gre¹ka potrage za paketom %s\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" odreðuje vi¹e paketa\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "gre¹ka: ne mogu da otvorim %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "Instaliram %s\n" @@ -3227,7 +3232,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "Neoèekivana ili nepoznata FTP gre¹ka" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3548,28 +3553,28 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "Lozinka za %s@%s: " -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" -#: lib/url.c:411 +#: lib/url.c:419 #, fuzzy msgid "url port must be a number\n" msgstr "gre¹ka: FTP port mora biti broj\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "neuspelo kreiranje %s\n" diff --git a/po/sv.po b/po/sv.po index 217587380..543da690f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" -msgstr "POT-Creation-Date: 1999-12-11 20:34-0500\n" +msgstr "POT-Creation-Date: 1999-12-12 11:59-0500\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, c-format msgid "cannot open %s/packages.rpm\n" msgstr "" @@ -1566,63 +1566,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "inga paket angivna för avinstallation" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "Tillverkningen misslyckades.\n" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "kan inte öppna: %s\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "kan inte öppna: %s\n" -#: build/files.c:1940 +#: build/files.c:1935 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2718,11 +2718,11 @@ msgstr "" msgid "open of %s failed: %s\n" msgstr "Tillverkningen misslyckades.\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "" @@ -2786,7 +2786,7 @@ msgstr "" msgid "record %d could not be read\n" msgstr "" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, fuzzy, c-format msgid "package %s is not installed\n" msgstr "inga paket angivna för installation" @@ -3020,7 +3020,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "kan inte öppna: %s\n" @@ -3119,33 +3119,38 @@ msgstr "" msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "inga paket angivna för installation" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, c-format msgid "found %d packages\n" msgstr "" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 msgid "looking for packages to download\n" msgstr "" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "" + +#: lib/rpminstall.c:165 #, fuzzy, c-format msgid "Retrieving %s\n" msgstr "RPM version %s\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "" @@ -3155,12 +3160,12 @@ msgstr "" msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "kan inte öppna: %s\n" -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "inga paket angivna för installation" @@ -3170,50 +3175,50 @@ msgstr "inga paket angivna f msgid "package %s is not relocateable\n" msgstr "inga paket angivna för installation" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, c-format msgid "error reading from file %s\n" msgstr "" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, c-format msgid "found %d source and %d binary packages\n" msgstr "" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr " --install " -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr " --install " -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna: %s\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "" @@ -3270,7 +3275,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3585,27 +3590,27 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:411 +#: lib/url.c:419 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "kan inte öppna: %s\n" diff --git a/po/tr.po b/po/tr.po index dc2e86cce..e87b2c5db 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-11 20:34-0500\n" +"POT-Creation-Date: 1999-12-12 11:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407 +#: build.c:25 lib/rpminstall.c:248 lib/rpminstall.c:422 #, fuzzy, c-format msgid "cannot open %s/packages.rpm\n" msgstr "hata: %s%s/packages.rpm açýlamýyor\n" @@ -1546,63 +1546,63 @@ msgstr "" msgid "File %4d: %07o %s.%s\t %s\n" msgstr "%s açýlamadý: %s" -#: build/files.c:1091 +#: build/files.c:1086 #, c-format msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1121 +#: build/files.c:1116 #, fuzzy, c-format msgid "File not found by glob: %s" msgstr "Dosya sunucuda bulunamadý" -#: build/files.c:1212 +#: build/files.c:1207 #, fuzzy msgid "Could not open %%files file %s: %s" msgstr "hata: %s dosyasý okunamadý\n" -#: build/files.c:1219 build/pack.c:482 +#: build/files.c:1214 build/pack.c:482 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1562 build/parsePrep.c:30 +#: build/files.c:1557 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1617 +#: build/files.c:1612 #, fuzzy, c-format msgid "Couldn't exec %s: %s" msgstr "PGP çalýþtýrýlamadý" -#: build/files.c:1622 +#: build/files.c:1617 #, fuzzy, c-format msgid "Couldn't fork %s: %s" msgstr "Ýmza hedefi 'sigtarget' okunamadý" -#: build/files.c:1704 +#: build/files.c:1699 #, fuzzy, c-format msgid "%s failed" msgstr "PGP hata verdi" -#: build/files.c:1708 +#: build/files.c:1703 #, fuzzy, c-format msgid "failed to write all data to %s" msgstr "%s yaratýlamýyor\n" -#: build/files.c:1797 +#: build/files.c:1792 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1825 build/files.c:1834 +#: build/files.c:1820 build/files.c:1829 #, fuzzy, c-format msgid "Failed to find %s:" msgstr "%s yaratýlamýyor\n" -#: build/files.c:1940 +#: build/files.c:1935 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "%s açýlamadý: %s" @@ -2702,11 +2702,11 @@ msgstr "hata: veritaban msgid "open of %s failed: %s\n" msgstr "%s 'ye erisimde belirtilen hata oluþtu: %s\n" -#: lib/query.c:490 +#: lib/query.c:489 msgid "old format source packages cannot be queried\n" msgstr "eski tip kaynak paketleri sorgulanamýyor\n" -#: lib/query.c:499 lib/rpminstall.c:228 +#: lib/query.c:498 lib/rpminstall.c:229 #, c-format msgid "%s does not appear to be a RPM package\n" msgstr "%s bir RPM paketi deðil (gibi)\n" @@ -2770,7 +2770,7 @@ msgstr "ge msgid "record %d could not be read\n" msgstr "%d numaralý kayýt okunamadý\n" -#: lib/query.c:652 lib/rpminstall.c:418 +#: lib/query.c:652 lib/rpminstall.c:433 #, c-format msgid "package %s is not installed\n" msgstr "%s pakedi yüklenmemiþ\n" @@ -3008,7 +3008,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur" -#: lib/rpmdb.c:157 lib/url.c:447 +#: lib/rpmdb.c:157 lib/url.c:459 #, fuzzy, c-format msgid "failed to open %s: %s\n" msgstr "%s açýlamadý: %s" @@ -3108,34 +3108,39 @@ msgstr "%d numaral msgid "header changed size!" msgstr "" -#: lib/rpminstall.c:124 +#: lib/rpminstall.c:126 #, fuzzy msgid "counting packages to install\n" msgstr "yüklenecek paketler belirtilmedi" -#: lib/rpminstall.c:128 +#: lib/rpminstall.c:130 #, fuzzy, c-format msgid "found %d packages\n" msgstr "Tüm paketleri sorgulama" -#: lib/rpminstall.c:137 +#: lib/rpminstall.c:135 #, fuzzy msgid "looking for packages to download\n" msgstr "%s pakedi aranýrken hata oluþtu\n" -#: lib/rpminstall.c:147 +#: lib/rpminstall.c:150 +#, fuzzy, c-format +msgid "skipping %s - rpmGlob failed(%d)\n" +msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n" + +#: lib/rpminstall.c:165 #, c-format msgid "Retrieving %s\n" msgstr "%s alýnýyor\n" #. XXX undefined %{name}/%{version}/%{release} here #. XXX %{_tmpdir} does not exist -#: lib/rpminstall.c:182 +#: lib/rpminstall.c:175 #, c-format msgid " ... as %s\n" msgstr "" -#: lib/rpminstall.c:186 +#: lib/rpminstall.c:179 #, fuzzy, c-format msgid "skipping %s - transfer failed - %s\n" msgstr "hata: %s atlanýyor - aktarým baþarýsýz - %s\n" @@ -3145,12 +3150,12 @@ msgstr "hata: %s atlan msgid "retrieved %d packages\n" msgstr "" -#: lib/rpminstall.c:215 lib/rpminstall.c:357 +#: lib/rpminstall.c:215 lib/rpminstall.c:358 #, fuzzy, c-format msgid "cannot open file %s: %s\n" msgstr "%s dosyasý açýlamýyor: " -#: lib/rpminstall.c:232 lib/rpminstall.c:495 +#: lib/rpminstall.c:233 lib/rpminstall.c:510 #, fuzzy, c-format msgid "%s cannot be installed\n" msgstr "hata: %s yüklenemedi\n" @@ -3160,50 +3165,50 @@ msgstr "hata: %s y msgid "package %s is not relocateable\n" msgstr "%s pakedi yüklenmemiþ\n" -#: lib/rpminstall.c:286 +#: lib/rpminstall.c:287 #, fuzzy, c-format msgid "error reading from file %s\n" msgstr "%s dizinin oluþturulmasýnda hata: %s" -#: lib/rpminstall.c:291 +#: lib/rpminstall.c:292 #, c-format msgid "file %s requires a newer version of RPM\n" msgstr "" -#: lib/rpminstall.c:308 +#: lib/rpminstall.c:309 #, fuzzy, c-format msgid "found %d source and %d binary packages\n" msgstr "%s grubu hiç paket içermiyor\n" -#: lib/rpminstall.c:319 +#: lib/rpminstall.c:320 msgid "failed dependencies:\n" msgstr "baðýmlýlýk hatasý, aþaðýdaki paketlere ihtiyacýnýz var:\n" -#: lib/rpminstall.c:337 +#: lib/rpminstall.c:338 #, fuzzy msgid "installing binary packages\n" msgstr "paket yüklemek" -#: lib/rpminstall.c:422 +#: lib/rpminstall.c:437 #, fuzzy, c-format msgid "searching for package %s\n" msgstr "%s paketi bulunamadý\n" -#: lib/rpminstall.c:431 +#: lib/rpminstall.c:446 #, c-format msgid "\"%s\" specifies multiple packages\n" msgstr "\"%s\" birden fazla paketi tanýmlýyor\n" -#: lib/rpminstall.c:457 +#: lib/rpminstall.c:472 msgid "removing these packages would break dependencies:\n" msgstr "bu paketin silinmesi aþaðýdaki baðýmlýlýklarý etkileyecektir:\n" -#: lib/rpminstall.c:484 +#: lib/rpminstall.c:499 #, fuzzy, c-format msgid "cannot open %s: %s\n" msgstr "hata: %s eriþilemiyor\n" -#: lib/rpminstall.c:490 +#: lib/rpminstall.c:505 #, c-format msgid "Installing %s\n" msgstr "%s yükleniyor\n" @@ -3268,7 +3273,7 @@ msgstr "" msgid "Unknown or unexpected error" msgstr "FTP bilinmeyen ya da beklenmeyen hata" -#: lib/rpmio.c:1329 +#: lib/rpmio.c:1347 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3589,28 +3594,28 @@ msgstr "" msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:130 +#: lib/url.c:132 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:223 +#: lib/url.c:229 #, c-format msgid "Password for %s@%s: " msgstr "%s'%s için parola" -#: lib/url.c:248 lib/url.c:274 +#: lib/url.c:254 lib/url.c:280 #, fuzzy, c-format msgid "error: %sport must be a number\n" msgstr "hata: ftpport bir sayý olmalý\n" -#: lib/url.c:411 +#: lib/url.c:419 #, fuzzy msgid "url port must be a number\n" msgstr "hata: ftpport bir sayý olmalý\n" #. XXX Fstrerror -#: lib/url.c:470 +#: lib/url.c:499 #, fuzzy, c-format msgid "failed to create %s: %s\n" msgstr "%s yaratýlamýyor\n" diff --git a/rpm.spec b/rpm.spec index 4bfae2fa7..8443bdb8f 100644 --- a/rpm.spec +++ b/rpm.spec @@ -2,7 +2,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 3.0.4 Version: %{version} -Release: 0.11 +Release: 0.12 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL