From 07fa5616811da29b4e4630288864f858b019e77f Mon Sep 17 00:00:00 2001 From: jbj Date: Mon, 15 Nov 1999 22:16:54 +0000 Subject: [PATCH] rpm.c: Add --ftpdebug, --urldebug, --rpmiodebug (for my sanity). build/pack.c: Remove unnecessary persist in package{Sources,Binaries}. lib/rpmio.c: Expose fdGetFp() for use in url.c. lib/rpmio.c: Debug refs with FILE/FTP/HTTP url's. lib/url.c: Push fp in order to use Fclose() when cleaning up url cache. CVS patchset: 3425 CVS date: 1999/11/15 22:16:54 --- build/pack.c | 6 +- lib/rpmio.h | 79 ++++---- lib/url.c | 28 ++- po/rpm.pot | 604 +++++++++++++++++++++++++++++------------------------------ rpm.c | 13 +- 5 files changed, 377 insertions(+), 353 deletions(-) diff --git a/build/pack.c b/build/pack.c index 3791742..3612c54 100644 --- a/build/pack.c +++ b/build/pack.c @@ -60,13 +60,12 @@ int packageSources(Spec spec) memset(csa, 0, sizeof(*csa)); csa->cpioArchiveSize = 0; csa->cpioFdIn = fdNew("init (packageSources)"); - csa->cpioFdIn = fdLink(csa->cpioFdIn, "persist (packageSources)"); csa->cpioList = spec->sourceCpioList; csa->cpioCount = spec->sourceCpioCount; rc = writeRPM(spec->sourceHeader, fn, RPMLEAD_SOURCE, csa, spec->passPhrase, &(spec->cookie)); - csa->cpioFdIn = fdFree(csa->cpioFdIn, "persist (packageSources)"); + csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageSources)"); xfree(fn); } return rc; @@ -158,13 +157,12 @@ int packageBinaries(Spec spec) memset(csa, 0, sizeof(*csa)); csa->cpioArchiveSize = 0; csa->cpioFdIn = fdNew("init (packageBinaries)"); - csa->cpioFdIn = fdLink(csa->cpioFdIn, "persist (packageBinaries)"); csa->cpioList = pkg->cpioList; csa->cpioCount = pkg->cpioCount; rc = writeRPM(pkg->header, fn, RPMLEAD_BINARY, csa, spec->passPhrase, NULL); - csa->cpioFdIn = fdFree(csa->cpioFdIn, "persist (packageBinaries)"); + csa->cpioFdIn = fdFree(csa->cpioFdIn, "init (packageBinaries)"); xfree(fn); if (rc) return rc; diff --git a/lib/rpmio.h b/lib/rpmio.h index 1f9df01..72b6fb8 100644 --- a/lib/rpmio.h +++ b/lib/rpmio.h @@ -39,26 +39,26 @@ typedef int fdio_lstat_function_t (const char * path, struct stat * st); typedef int fdio_access_function_t (const char * path, int amode); struct FDIO_s { - cookie_read_function_t *read; - cookie_write_function_t *write; - cookie_seek_function_t *seek; - cookie_close_function_t *close; - - fdio_ref_function_t *ref; - fdio_deref_function_t *deref; - fdio_new_function_t *new; - fdio_fileno_function_t *fileno; - - fdio_open_function_t *open; - fdio_fopen_function_t *fopen; - fdio_ffileno_function_t *ffileno; - fdio_fflush_function_t *fflush; - - fdio_mkdir_function_t *mkdir; - fdio_chdir_function_t *chdir; - fdio_rmdir_function_t *rmdir; - fdio_rename_function_t *rename; - fdio_unlink_function_t *unlink; + cookie_read_function_t * read; + cookie_write_function_t * write; + cookie_seek_function_t * seek; + cookie_close_function_t * close; + + fdio_ref_function_t * ref; + fdio_deref_function_t * deref; + fdio_new_function_t * new; + fdio_fileno_function_t * fileno; + + fdio_open_function_t * open; + fdio_fopen_function_t * fopen; + fdio_ffileno_function_t * ffileno; + fdio_fflush_function_t * fflush; + + fdio_mkdir_function_t * mkdir; + fdio_chdir_function_t * chdir; + fdio_rmdir_function_t * rmdir; + fdio_rename_function_t * rename; + fdio_unlink_function_t * unlink; }; /*@observer@*/ const char * Fstrerror(FD_t fd); @@ -89,23 +89,24 @@ int Access (const char * path, int amode); /*@observer@*/ extern FDIO_t gzdio; -void fdPush(FD_t fd, FDIO_t io, void * fp, int fdno); -void fdPop(FD_t fd); +void fdPush (FD_t fd, FDIO_t io, void * fp, int fdno); +void fdPop (FD_t fd); -void fdSetFdno(FD_t fd, int fdno); -off_t fdSize(FD_t fd); -void fdSetSyserrno(FD_t fd, int syserrno, const void * errcookie); +void * fdGetFp (FD_t fd); +void fdSetFdno(FD_t fd, int fdno); +off_t fdSize (FD_t fd); +void fdSetSyserrno(FD_t fd, int syserrno, const void * errcookie); /*@null@*/ const FDIO_t fdGetIo(FD_t fd); -void fdSetIo(FD_t fd, FDIO_t io); +void fdSetIo (FD_t fd, FDIO_t io); -int fdGetRdTimeoutSecs(FD_t fd); +int fdGetRdTimeoutSecs(FD_t fd); -int fdGetFtpFileDoneNeeded(FD_t fd); -void fdSetFtpFileDoneNeeded(FD_t fd, int ftpFileDoneNeeded); +int fdGetFtpFileDoneNeeded(FD_t fd); +void fdSetFtpFileDoneNeeded(FD_t fd, int ftpFileDoneNeeded); long int fdGetCpioPos(FD_t fd); -void fdSetCpioPos(FD_t fd, long int cpioPos); +void fdSetCpioPos(FD_t fd, long int cpioPos); extern /*@null@*/ FD_t fdDup(int fdno); #ifdef UNUSED @@ -137,8 +138,8 @@ extern /*@null@*/ FILE *fdFdopen( /*@only@*/ void * cookie, const char * mode); /*@dependent@*/ /*@null@*/ void * ufdGetUrlinfo(FD_t fd); /*@observer@*/ const char * urlStrerror(const char * url); -int ufdCopy(FD_t sfd, FD_t tfd); -int ufdGetFile( /*@killref@*/ FD_t sfd, FD_t tfd); +int ufdCopy(FD_t sfd, FD_t tfd); +int ufdGetFile( /*@killref@*/ FD_t sfd, FD_t tfd); const char *const ftpStrerror(int errorNumber); #if 0 @@ -161,23 +162,23 @@ const char *const ftpStrerror(int errorNumber); #define ufdUnlink ufdio->unlink #endif -int fdWritable(FD_t fd, int secs); -int fdReadable(FD_t fd, int secs); -int fdRdline(FD_t fd, /*@out@*/ char * buf, size_t len); +int fdWritable(FD_t fd, int secs); +int fdReadable(FD_t fd, int secs); +int fdRdline(FD_t fd, /*@out@*/ char * buf, size_t len); -int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length); +int timedRead(FD_t fd, /*@out@*/ void * bufptr, int length); +#define timedRead ufdio->read /*@observer@*/ extern FDIO_t ufdio; -#define timedRead ufdio->read /* * Support for first fit File Allocation I/O. */ long int fadGetFileSize(FD_t fd); -void fadSetFileSize(FD_t fd, long int fileSize); +void fadSetFileSize(FD_t fd, long int fileSize); unsigned int fadGetFirstFree(FD_t fd); -void fadSetFirstFree(FD_t fd, unsigned int firstFree); +void fadSetFirstFree(FD_t fd, unsigned int firstFree); /*@observer@*/ extern FDIO_t fadio; diff --git a/lib/url.c b/lib/url.c index 63b4951..6b3d1ba 100644 --- a/lib/url.c +++ b/lib/url.c @@ -64,22 +64,38 @@ DBGREFS(0, (stderr, "--> url %p -- %d %s at %s:%u\n", u, u->nrefs, msg, file, li if (--u->nrefs > 0) return u; if (u->ctrl) { - void * uctrl = u->ctrl; - if (fdio->fileno(u->ctrl) >= 0) +#ifndef NOTYET + FILE * fp = fdGetFp(u->ctrl); + if (fp) { + fdPush(u->ctrl, fpio, fp, fileno(fp)); /* Push fpio onto stack */ + Fclose(u->ctrl); + } else if (fdio->fileno(u->ctrl) >= 0) fdio->close(u->ctrl); +#else + Fclose(u->ctrl); +#endif + u->ctrl = fdio->deref(u->ctrl, "persist ctrl (urlFree)", file, line); if (u->ctrl) fprintf(stderr, _("warning: u %p ctrl %p nrefs != 0 (%s %s)\n"), - u, uctrl, u->host, u->service); + u, u->ctrl, u->host, u->service); } if (u->data) { - void * udata = u->data; - if (fdio->fileno(u->data) >= 0) +#ifndef NOTYET + FILE * fp = fdGetFp(u->data); + if (fp) { + fdPush(u->data, fpio, fp, fileno(fp)); /* Push fpio onto stack */ + Fclose(u->data); + } else if (fdio->fileno(u->data) >= 0) fdio->close(u->data); +#else + Fclose(u->ctrl); +#endif + u->data = fdio->deref(u->data, "persist data (urlFree)", file, line); if (u->data) fprintf(stderr, _("warning: u %p data %p nrefs != 0 (%s %s)\n"), - u, udata, u->host, u->service); + u, u->data, u->host, u->service); } if (u->buf) { free(u->buf); diff --git a/po/rpm.pot b/po/rpm.pot index 01fcb3f..af50712 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-11-14 12:51-0500\n" +"POT-Creation-Date: 1999-11-15 16:49-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,7 +90,7 @@ msgstr "" msgid "override build root" msgstr "" -#: build.c:374 rpm.c:484 +#: build.c:374 rpm.c:490 msgid "remove build tree when done" msgstr "" @@ -110,7 +110,7 @@ msgstr "" msgid "remove specfile when done" msgstr "" -#: build.c:384 rpm.c:482 +#: build.c:384 rpm.c:488 msgid "skip straight to specified stage (only for c,i)" msgstr "" @@ -164,1056 +164,1056 @@ msgstr "" msgid "no copyright!\n" msgstr "" -#: rpm.c:186 +#: rpm.c:192 #, c-format msgid "rpm: %s\n" msgstr "" -#: rpm.c:197 +#: rpm.c:203 #, c-format msgid "RPM version %s\n" msgstr "" -#: rpm.c:201 +#: rpm.c:207 msgid "Copyright (C) 1998 - Red Hat Software" msgstr "" -#: rpm.c:202 +#: rpm.c:208 msgid "This may be freely redistributed under the terms of the GNU GPL" msgstr "" -#: rpm.c:210 +#: rpm.c:216 msgid "usage: rpm {--help}" msgstr "" -#: rpm.c:211 +#: rpm.c:217 msgid " rpm {--version}" msgstr "" -#: rpm.c:212 +#: rpm.c:218 msgid " rpm {--initdb} [--dbpath ]" msgstr "" -#: rpm.c:213 +#: rpm.c:219 msgid "" " rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:214 +#: rpm.c:220 msgid " [--replacepkgs] [--replacefiles] [--root ]" msgstr "" -#: rpm.c:215 +#: rpm.c:221 msgid " [--excludedocs] [--includedocs] [--noscripts]" msgstr "" -#: rpm.c:216 +#: rpm.c:222 msgid "" " [--rcfile ] [--ignorearch] [--dbpath ]" msgstr "" -#: rpm.c:217 +#: rpm.c:223 msgid "" " [--prefix ] [--ignoreos] [--nodeps] [--allfiles]" msgstr "" -#: rpm.c:218 +#: rpm.c:224 msgid "" " [--ftpproxy ] [--ftpport ] [--justdb]" msgstr "" -#: rpm.c:219 rpm.c:228 rpm.c:237 +#: rpm.c:225 rpm.c:234 rpm.c:243 msgid " [--httpproxy ] [--httpport ] " msgstr "" -#: rpm.c:220 rpm.c:230 +#: rpm.c:226 rpm.c:236 msgid " [--noorder] [--relocate oldpath=newpath]" msgstr "" -#: rpm.c:221 +#: rpm.c:227 msgid "" " [--badreloc] [--notriggers] [--excludepath ]" msgstr "" -#: rpm.c:222 +#: rpm.c:228 msgid " [--ignoresize] file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:223 +#: rpm.c:229 msgid "" " rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]" msgstr "" -#: rpm.c:224 +#: rpm.c:230 msgid " [--oldpackage] [--root ] [--noscripts]" msgstr "" -#: rpm.c:225 +#: rpm.c:231 msgid "" " [--excludedocs] [--includedocs] [--rcfile ]" msgstr "" -#: rpm.c:226 +#: rpm.c:232 msgid "" " [--ignorearch] [--dbpath ] [--prefix ] " msgstr "" -#: rpm.c:227 +#: rpm.c:233 msgid " [--ftpproxy ] [--ftpport ]" msgstr "" -#: rpm.c:229 +#: rpm.c:235 msgid " [--ignoreos] [--nodeps] [--allfiles] [--justdb]" msgstr "" -#: rpm.c:231 +#: rpm.c:237 msgid "" " [--badreloc] [--excludepath ] [--ignoresize]" msgstr "" -#: rpm.c:232 +#: rpm.c:238 msgid " file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:233 +#: rpm.c:239 msgid " rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]" msgstr "" -#: rpm.c:234 +#: rpm.c:240 msgid " [--scripts] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:235 +#: rpm.c:241 msgid " [--whatprovides] [--whatrequires] [--requires]" msgstr "" -#: rpm.c:236 +#: rpm.c:242 msgid "" " [--triggeredby] [--ftpuseport] [--ftpproxy ]" msgstr "" -#: rpm.c:238 +#: rpm.c:244 msgid "" " [--ftpport ] [--provides] [--triggers] [--dump]" msgstr "" -#: rpm.c:239 +#: rpm.c:245 msgid " [--changelog] [--dbpath ] [targets]" msgstr "" -#: rpm.c:240 +#: rpm.c:246 msgid " rpm {--verify -V -y} [-afpg] [--root ] [--rcfile ]" msgstr "" -#: rpm.c:241 +#: rpm.c:247 msgid "" " [--dbpath ] [--nodeps] [--nofiles] [--noscripts]" msgstr "" -#: rpm.c:242 +#: rpm.c:248 msgid " [--nomd5] [targets]" msgstr "" -#: rpm.c:243 +#: rpm.c:249 msgid " rpm {--setperms} [-afpg] [target]" msgstr "" -#: rpm.c:244 +#: rpm.c:250 msgid " rpm {--setugids} [-afpg] [target]" msgstr "" -#: rpm.c:245 +#: rpm.c:251 msgid " rpm {--freshen -F} file1.rpm ... fileN.rpm" msgstr "" -#: rpm.c:246 +#: rpm.c:252 msgid " rpm {--erase -e} [--root ] [--noscripts] [--rcfile ]" msgstr "" -#: rpm.c:247 +#: rpm.c:253 msgid " [--dbpath ] [--nodeps] [--allmatches]" msgstr "" -#: rpm.c:248 +#: rpm.c:254 msgid "" " [--justdb] [--notriggers] rpackage1 ... packageN" msgstr "" -#: rpm.c:249 +#: rpm.c:255 msgid "" " rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile ]" msgstr "" -#: rpm.c:250 +#: rpm.c:256 msgid " [--sign] [--nobuild] [--timecheck ] ]" msgstr "" -#: rpm.c:251 +#: rpm.c:257 msgid " [--target=platform1[,platform2...]]" msgstr "" -#: rpm.c:252 +#: rpm.c:258 msgid " [--rmsource] [--rmspec] specfile" msgstr "" -#: rpm.c:253 +#: rpm.c:259 msgid " rpm {--rmsource} [--rcfile ] [-v] specfile" msgstr "" -#: rpm.c:254 +#: rpm.c:260 msgid "" " rpm {--rebuild} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:255 +#: rpm.c:261 msgid "" " rpm {--recompile} [--rcfile ] [-v] source1.rpm ... sourceN.rpm" msgstr "" -#: rpm.c:256 +#: rpm.c:262 msgid " rpm {--resign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:257 +#: rpm.c:263 msgid " rpm {--addsign} [--rcfile ] package1 package2 ... packageN" msgstr "" -#: rpm.c:258 +#: rpm.c:264 msgid "" " rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile ]" msgstr "" -#: rpm.c:259 +#: rpm.c:265 msgid " package1 ... packageN" msgstr "" -#: rpm.c:260 +#: rpm.c:266 msgid " rpm {--rebuilddb} [--rcfile ] [--dbpath ]" msgstr "" -#: rpm.c:261 +#: rpm.c:267 msgid " rpm {--querytags}" msgstr "" -#: rpm.c:295 +#: rpm.c:301 msgid "usage:" msgstr "" -#: rpm.c:297 +#: rpm.c:303 msgid "print this message" msgstr "" -#: rpm.c:299 +#: rpm.c:305 msgid "print the version of rpm being used" msgstr "" -#: rpm.c:300 +#: rpm.c:306 msgid " all modes support the following arguments:" msgstr "" -#: rpm.c:301 +#: rpm.c:307 msgid " --rcfile " msgstr "" -#: rpm.c:302 +#: rpm.c:308 msgid "use instead of /etc/rpmrc and $HOME/.rpmrc" msgstr "" -#: rpm.c:304 +#: rpm.c:310 msgid "be a little more verbose" msgstr "" -#: rpm.c:306 +#: rpm.c:312 msgid "be incredibly verbose (for debugging)" msgstr "" -#: rpm.c:308 +#: rpm.c:314 msgid "query mode" msgstr "" -#: rpm.c:309 rpm.c:371 rpm.c:435 rpm.c:463 +#: rpm.c:315 rpm.c:377 rpm.c:441 rpm.c:469 msgid " --root " msgstr "" -#: rpm.c:310 rpm.c:372 rpm.c:436 rpm.c:464 rpm.c:526 +#: rpm.c:316 rpm.c:378 rpm.c:442 rpm.c:470 rpm.c:532 msgid "use as the top level directory" msgstr "" -#: rpm.c:311 rpm.c:369 rpm.c:399 rpm.c:451 rpm.c:523 +#: rpm.c:317 rpm.c:375 rpm.c:405 rpm.c:457 rpm.c:529 msgid " --dbpath " msgstr "" -#: rpm.c:312 rpm.c:370 rpm.c:400 rpm.c:452 rpm.c:524 +#: rpm.c:318 rpm.c:376 rpm.c:406 rpm.c:458 rpm.c:530 msgid "use as the directory for the database" msgstr "" -#: rpm.c:313 +#: rpm.c:319 msgid " --queryformat " msgstr "" -#: rpm.c:314 +#: rpm.c:320 msgid "use as the header format (implies -i)" msgstr "" -#: rpm.c:315 +#: rpm.c:321 msgid "" " install, upgrade and query (with -p) allow ftp URL's to be used in place" msgstr "" -#: rpm.c:316 +#: rpm.c:322 msgid " of file names as well as the following options:" msgstr "" -#: rpm.c:317 +#: rpm.c:323 msgid " --ftpproxy " msgstr "" -#: rpm.c:318 +#: rpm.c:324 msgid "hostname or IP of ftp proxy" msgstr "" -#: rpm.c:319 +#: rpm.c:325 msgid " --ftpport " msgstr "" -#: rpm.c:320 +#: rpm.c:326 msgid "port number of ftp server (or proxy)" msgstr "" -#: rpm.c:321 +#: rpm.c:327 msgid " --httpproxy " msgstr "" -#: rpm.c:322 +#: rpm.c:328 msgid "hostname or IP of http proxy" msgstr "" -#: rpm.c:323 +#: rpm.c:329 msgid " --httpport " msgstr "" -#: rpm.c:324 +#: rpm.c:330 msgid "port number of http server (or proxy)" msgstr "" -#: rpm.c:325 +#: rpm.c:331 msgid " Package specification options:" msgstr "" -#: rpm.c:327 +#: rpm.c:333 msgid "query all packages" msgstr "" -#: rpm.c:328 +#: rpm.c:334 msgid " -f + " msgstr "" -#: rpm.c:329 +#: rpm.c:335 msgid "query package owning " msgstr "" -#: rpm.c:330 +#: rpm.c:336 msgid " -p + " msgstr "" -#: rpm.c:331 +#: rpm.c:337 msgid "query (uninstalled) package " msgstr "" -#: rpm.c:332 +#: rpm.c:338 msgid " --triggeredby " msgstr "" -#: rpm.c:333 +#: rpm.c:339 msgid "query packages triggered by " msgstr "" -#: rpm.c:334 +#: rpm.c:340 msgid " --whatprovides " msgstr "" -#: rpm.c:335 +#: rpm.c:341 msgid "query packages which provide capability" msgstr "" -#: rpm.c:336 +#: rpm.c:342 msgid " --whatrequires " msgstr "" -#: rpm.c:337 +#: rpm.c:343 msgid "query packages which require capability" msgstr "" -#: rpm.c:338 +#: rpm.c:344 msgid " Information selection options:" msgstr "" -#: rpm.c:340 +#: rpm.c:346 msgid "display package information" msgstr "" -#: rpm.c:342 +#: rpm.c:348 msgid "display the package's change log" msgstr "" -#: rpm.c:344 +#: rpm.c:350 msgid "display package file list" msgstr "" -#: rpm.c:346 +#: rpm.c:352 msgid "show file states (implies -l)" msgstr "" -#: rpm.c:348 +#: rpm.c:354 msgid "list only documentation files (implies -l)" msgstr "" -#: rpm.c:350 +#: rpm.c:356 msgid "list only configuration files (implies -l)" msgstr "" -#: rpm.c:352 +#: rpm.c:358 msgid "" "show all verifiable information for each file (must be used with -l, -c, or " "-d)" msgstr "" -#: rpm.c:354 +#: rpm.c:360 msgid "list capabilities package provides" msgstr "" -#: rpm.c:355 +#: rpm.c:361 msgid " --requires" msgstr "" -#: rpm.c:357 +#: rpm.c:363 msgid "list package dependencies" msgstr "" -#: rpm.c:359 +#: rpm.c:365 msgid "print the various [un]install scripts" msgstr "" -#: rpm.c:361 +#: rpm.c:367 msgid "show the trigger scripts contained in the package" msgstr "" -#: rpm.c:365 +#: rpm.c:371 msgid " --pipe " msgstr "" -#: rpm.c:366 +#: rpm.c:372 msgid "send stdout to " msgstr "" -#: rpm.c:368 +#: rpm.c:374 msgid "" "verify a package installation using the same same package specification " "options as -q" msgstr "" -#: rpm.c:374 rpm.c:422 rpm.c:456 +#: rpm.c:380 rpm.c:428 rpm.c:462 msgid "do not verify package dependencies" msgstr "" -#: rpm.c:376 +#: rpm.c:382 msgid "do not verify file md5 checksums" msgstr "" -#: rpm.c:378 +#: rpm.c:384 msgid "do not verify file attributes" msgstr "" -#: rpm.c:381 +#: rpm.c:387 msgid "" "set the file permissions to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:384 +#: rpm.c:390 msgid "" "set the file owner and group to those in the package database using the same " "package specification options as -q" msgstr "" -#: rpm.c:388 +#: rpm.c:394 msgid " --install " msgstr "" -#: rpm.c:389 +#: rpm.c:395 msgid " -i " msgstr "" -#: rpm.c:390 +#: rpm.c:396 msgid "install package" msgstr "" -#: rpm.c:391 +#: rpm.c:397 msgid " --excludepath " msgstr "" -#: rpm.c:392 +#: rpm.c:398 msgid "skip files in path " msgstr "" -#: rpm.c:393 +#: rpm.c:399 msgid " --relocate =" msgstr "" -#: rpm.c:394 +#: rpm.c:400 msgid "relocate files from to " msgstr "" -#: rpm.c:396 +#: rpm.c:402 msgid "relocate files even though the package doesn't allow it" msgstr "" -#: rpm.c:397 +#: rpm.c:403 msgid " --prefix " msgstr "" -#: rpm.c:398 +#: rpm.c:404 msgid "relocate the package to , if relocatable" msgstr "" -#: rpm.c:402 +#: rpm.c:408 msgid "do not install documentation" msgstr "" -#: rpm.c:404 +#: rpm.c:410 msgid "short hand for --replacepkgs --replacefiles" msgstr "" -#: rpm.c:407 +#: rpm.c:413 msgid "print hash marks as package installs (good with -v)" msgstr "" -#: rpm.c:409 +#: rpm.c:415 msgid "install all files, even configurations which might otherwise be skipped" msgstr "" -#: rpm.c:412 +#: rpm.c:418 msgid "don't verify package architecture" msgstr "" -#: rpm.c:414 +#: rpm.c:420 msgid "don't check disk space before installing" msgstr "" -#: rpm.c:416 +#: rpm.c:422 msgid "don't verify package operating system" msgstr "" -#: rpm.c:418 +#: rpm.c:424 msgid "install documentation" msgstr "" -#: rpm.c:420 rpm.c:454 +#: rpm.c:426 rpm.c:460 msgid "update the database, but do not modify the filesystem" msgstr "" -#: rpm.c:424 rpm.c:458 +#: rpm.c:430 rpm.c:464 msgid "do not reorder package installation to satisfy dependencies" msgstr "" -#: rpm.c:426 +#: rpm.c:432 msgid "don't execute any installation scripts" msgstr "" -#: rpm.c:428 rpm.c:462 +#: rpm.c:434 rpm.c:468 msgid "don't execute any scripts triggered by this package" msgstr "" -#: rpm.c:430 +#: rpm.c:436 msgid "print percentages as package installs" msgstr "" -#: rpm.c:432 +#: rpm.c:438 msgid "install even if the package replaces installed files" msgstr "" -#: rpm.c:434 +#: rpm.c:440 msgid "reinstall if the package is already present" msgstr "" -#: rpm.c:438 +#: rpm.c:444 msgid "don't install, but tell if it would work or not" msgstr "" -#: rpm.c:440 +#: rpm.c:446 msgid " --upgrade " msgstr "" -#: rpm.c:441 +#: rpm.c:447 msgid " -U " msgstr "" -#: rpm.c:442 +#: rpm.c:448 msgid "upgrade package (same options as --install, plus)" msgstr "" -#: rpm.c:444 +#: rpm.c:450 msgid "" "upgrade to an old version of the package (--force on upgrades does this " "automatically)" msgstr "" -#: rpm.c:446 +#: rpm.c:452 msgid " --erase " msgstr "" -#: rpm.c:448 +#: rpm.c:454 msgid "erase (uninstall) package" msgstr "" -#: rpm.c:450 +#: rpm.c:456 msgid "" "remove all packages which match (normally an error is generated if " " specified multiple packages)" msgstr "" -#: rpm.c:460 +#: rpm.c:466 msgid "do not execute any package specific scripts" msgstr "" -#: rpm.c:466 +#: rpm.c:472 msgid " -b " msgstr "" -#: rpm.c:467 +#: rpm.c:473 msgid " -t " msgstr "" -#: rpm.c:468 +#: rpm.c:474 msgid "build package, where is one of:" msgstr "" -#: rpm.c:470 +#: rpm.c:476 msgid "prep (unpack sources and apply patches)" msgstr "" -#: rpm.c:472 +#: rpm.c:478 #, c-format msgid "list check (do some cursory checks on %files)" msgstr "" -#: rpm.c:474 +#: rpm.c:480 msgid "compile (prep and compile)" msgstr "" -#: rpm.c:476 +#: rpm.c:482 msgid "install (prep, compile, install)" msgstr "" -#: rpm.c:478 +#: rpm.c:484 msgid "binary package (prep, compile, install, package)" msgstr "" -#: rpm.c:480 +#: rpm.c:486 msgid "bin/src package (prep, compile, install, package)" msgstr "" -#: rpm.c:486 +#: rpm.c:492 msgid "remove sources and spec file when done" msgstr "" -#: rpm.c:488 +#: rpm.c:494 msgid "generate PGP/GPG signature" msgstr "" -#: rpm.c:489 +#: rpm.c:495 msgid " --buildroot " msgstr "" -#: rpm.c:490 +#: rpm.c:496 msgid "use as the build root" msgstr "" -#: rpm.c:491 +#: rpm.c:497 msgid " --target=+" msgstr "" -#: rpm.c:492 +#: rpm.c:498 msgid "build the packages for the build targets platform1...platformN." msgstr "" -#: rpm.c:494 +#: rpm.c:500 msgid "do not execute any stages" msgstr "" -#: rpm.c:495 +#: rpm.c:501 msgid " --timecheck " msgstr "" -#: rpm.c:496 +#: rpm.c:502 msgid "set the time check to seconds (0 disables)" msgstr "" -#: rpm.c:498 +#: rpm.c:504 msgid " --rebuild " msgstr "" -#: rpm.c:499 +#: rpm.c:505 msgid "" "install source package, build binary package and remove spec file, sources, " "patches, and icons." msgstr "" -#: rpm.c:500 +#: rpm.c:506 msgid " --rmsource " msgstr "" -#: rpm.c:501 +#: rpm.c:507 msgid "remove sources and spec file" msgstr "" -#: rpm.c:502 +#: rpm.c:508 msgid " --recompile " msgstr "" -#: rpm.c:503 +#: rpm.c:509 msgid "like --rebuild, but don't build any package" msgstr "" -#: rpm.c:504 +#: rpm.c:510 msgid " --resign + " msgstr "" -#: rpm.c:505 +#: rpm.c:511 msgid "sign a package (discard current signature)" msgstr "" -#: rpm.c:506 +#: rpm.c:512 msgid " --addsign + " msgstr "" -#: rpm.c:507 +#: rpm.c:513 msgid "add a signature to a package" msgstr "" -#: rpm.c:509 +#: rpm.c:515 msgid " --checksig + " msgstr "" -#: rpm.c:510 +#: rpm.c:516 msgid "verify package signature" msgstr "" -#: rpm.c:512 +#: rpm.c:518 msgid "skip any PGP signatures" msgstr "" -#: rpm.c:514 +#: rpm.c:520 msgid "skip any GPG signatures" msgstr "" -#: rpm.c:516 +#: rpm.c:522 msgid "skip any MD5 signatures" msgstr "" -#: rpm.c:518 +#: rpm.c:524 msgid "list the tags that can be used in a query format" msgstr "" -#: rpm.c:520 +#: rpm.c:526 msgid "make sure a valid database exists" msgstr "" -#: rpm.c:522 +#: rpm.c:528 msgid "rebuild database from existing database" msgstr "" -#: rpm.c:668 rpm.c:674 rpm.c:681 rpm.c:687 rpm.c:696 rpm.c:703 rpm.c:750 -#: rpm.c:756 rpm.c:790 rpm.c:796 rpm.c:802 rpm.c:810 rpm.c:851 rpm.c:906 -#: rpm.c:913 +#: rpm.c:677 rpm.c:683 rpm.c:690 rpm.c:696 rpm.c:705 rpm.c:712 rpm.c:759 +#: rpm.c:765 rpm.c:799 rpm.c:805 rpm.c:811 rpm.c:819 rpm.c:860 rpm.c:915 +#: rpm.c:922 msgid "only one major mode may be specified" msgstr "" -#: rpm.c:689 +#: rpm.c:698 msgid "-u and --uninstall are deprecated and no longer work.\n" msgstr "" -#: rpm.c:691 +#: rpm.c:700 msgid "Use -e or --erase instead.\n" msgstr "" -#: rpm.c:707 +#: rpm.c:716 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: rpm.c:711 +#: rpm.c:720 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument" msgstr "" -#: rpm.c:763 rpm.c:769 rpm.c:776 rpm.c:783 rpm.c:920 +#: rpm.c:772 rpm.c:778 rpm.c:785 rpm.c:792 rpm.c:929 msgid "one type of query/verify may be performed at a time" msgstr "" -#: rpm.c:820 +#: rpm.c:829 msgid "arguments to --dbpath must begin with a /" msgstr "" -#: rpm.c:857 +#: rpm.c:866 msgid "relocations must begin with a /" msgstr "" -#: rpm.c:859 +#: rpm.c:868 msgid "relocations must contain a =" msgstr "" -#: rpm.c:862 +#: rpm.c:871 msgid "relocations must have a / following the =" msgstr "" -#: rpm.c:871 +#: rpm.c:880 msgid "exclude paths must begin with a /" msgstr "" -#: rpm.c:880 +#: rpm.c:889 #, c-format msgid "Internal error in argument processing (%d) :-(\n" msgstr "" -#: rpm.c:931 +#: rpm.c:940 msgid "--dbpath given for operation that does not use a database" msgstr "" -#: rpm.c:935 +#: rpm.c:944 msgid "--timecheck may only be used during package builds" msgstr "" -#: rpm.c:938 +#: rpm.c:947 msgid "unexpected query flags" msgstr "" -#: rpm.c:941 +#: rpm.c:950 msgid "unexpected query format" msgstr "" -#: rpm.c:944 +#: rpm.c:953 msgid "unexpected query source" msgstr "" -#: rpm.c:950 +#: rpm.c:959 msgid "only installation, upgrading, rmsource and rmspec may be forced" msgstr "" -#: rpm.c:953 +#: rpm.c:962 msgid "files may only be relocated during package installation" msgstr "" -#: rpm.c:956 +#: rpm.c:965 msgid "only one of --prefix or --relocate may be used" msgstr "" -#: rpm.c:959 +#: rpm.c:968 msgid "" "--relocate and --excludepath may only be used when installing new packages" msgstr "" -#: rpm.c:962 +#: rpm.c:971 msgid "--prefix may only be used when installing new packages" msgstr "" -#: rpm.c:965 +#: rpm.c:974 msgid "arguments to --prefix must begin with a /" msgstr "" -#: rpm.c:968 +#: rpm.c:977 msgid "--hash (-h) may only be specified during package installation" msgstr "" -#: rpm.c:972 +#: rpm.c:981 msgid "--percent may only be specified during package installation" msgstr "" -#: rpm.c:976 +#: rpm.c:985 msgid "--replacefiles may only be specified during package installation" msgstr "" -#: rpm.c:980 +#: rpm.c:989 msgid "--replacepkgs may only be specified during package installation" msgstr "" -#: rpm.c:984 +#: rpm.c:993 msgid "--excludedocs may only be specified during package installation" msgstr "" -#: rpm.c:988 +#: rpm.c:997 msgid "--includedocs may only be specified during package installation" msgstr "" -#: rpm.c:992 +#: rpm.c:1001 msgid "only one of --excludedocs and --includedocs may be specified" msgstr "" -#: rpm.c:996 +#: rpm.c:1005 msgid "--ignorearch may only be specified during package installation" msgstr "" -#: rpm.c:1000 +#: rpm.c:1009 msgid "--ignoreos may only be specified during package installation" msgstr "" -#: rpm.c:1004 +#: rpm.c:1013 msgid "--ignoresize may only be specified during package installation" msgstr "" -#: rpm.c:1008 +#: rpm.c:1017 msgid "--allmatches may only be specified during package erasure" msgstr "" -#: rpm.c:1012 +#: rpm.c:1021 msgid "--allfiles may only be specified during package installation" msgstr "" -#: rpm.c:1016 +#: rpm.c:1025 msgid "--justdb may only be specified during package installation and erasure" msgstr "" -#: rpm.c:1021 +#: rpm.c:1030 msgid "" "--noscripts may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:1025 +#: rpm.c:1034 msgid "" "--notriggers may only be specified during package installation, erasure, and " "verification" msgstr "" -#: rpm.c:1029 +#: rpm.c:1038 msgid "" "--nodeps may only be specified during package building, installation, " "erasure, and verification" msgstr "" -#: rpm.c:1033 +#: rpm.c:1042 msgid "" "--test may only be specified during package installation, erasure, and " "building" msgstr "" -#: rpm.c:1037 +#: rpm.c:1046 msgid "" "--root (-r) may only be specified during installation, erasure, querying, " "and database rebuilds" msgstr "" -#: rpm.c:1049 +#: rpm.c:1058 msgid "arguments to --root (-r) must begin with a /" msgstr "" -#: rpm.c:1055 +#: rpm.c:1064 msgid "--oldpackage may only be used during upgrades" msgstr "" -#: rpm.c:1060 +#: rpm.c:1069 msgid "" "ftp options can only be used during package queries, installs, and upgrades" msgstr "" -#: rpm.c:1066 +#: rpm.c:1075 msgid "" "http options can only be used during package queries, installs, and upgrades" msgstr "" -#: rpm.c:1070 +#: rpm.c:1079 msgid "--nopgp may only be used during signature checking" msgstr "" -#: rpm.c:1073 +#: rpm.c:1082 msgid "--nogpg may only be used during signature checking" msgstr "" -#: rpm.c:1076 +#: rpm.c:1085 msgid "" "--nomd5 may only be used during signature checking and package verification" msgstr "" -#: rpm.c:1100 +#: rpm.c:1109 msgid "no files to sign\n" msgstr "" -#: rpm.c:1105 +#: rpm.c:1114 #, c-format msgid "cannot access file %s\n" msgstr "" -#: rpm.c:1120 +#: rpm.c:1129 msgid "pgp not found: " msgstr "" -#: rpm.c:1124 +#: rpm.c:1133 msgid "Enter pass phrase: " msgstr "" -#: rpm.c:1126 +#: rpm.c:1135 msgid "Pass phrase check failed\n" msgstr "" -#: rpm.c:1129 +#: rpm.c:1138 msgid "Pass phrase is good.\n" msgstr "" -#: rpm.c:1134 +#: rpm.c:1143 msgid "Invalid %%_signature spec in macro file.\n" msgstr "" -#: rpm.c:1140 +#: rpm.c:1149 msgid "--sign may only be used during package building" msgstr "" -#: rpm.c:1155 +#: rpm.c:1164 msgid "exec failed\n" msgstr "" -#: rpm.c:1174 +#: rpm.c:1183 msgid "unexpected arguments to --querytags " msgstr "" -#: rpm.c:1185 +#: rpm.c:1194 msgid "no packages given for signature check" msgstr "" -#: rpm.c:1196 +#: rpm.c:1205 msgid "no packages given for signing" msgstr "" -#: rpm.c:1208 +#: rpm.c:1217 msgid "no packages files given for rebuild" msgstr "" -#: rpm.c:1271 +#: rpm.c:1280 msgid "no spec files given for build" msgstr "" -#: rpm.c:1273 +#: rpm.c:1282 msgid "no tar files given for build" msgstr "" -#: rpm.c:1289 +#: rpm.c:1298 msgid "no packages given for uninstall" msgstr "" -#: rpm.c:1339 +#: rpm.c:1348 msgid "no packages given for install" msgstr "" -#: rpm.c:1362 +#: rpm.c:1371 msgid "extra arguments given for query of all packages" msgstr "" -#: rpm.c:1367 +#: rpm.c:1376 msgid "no arguments given for query" msgstr "" -#: rpm.c:1384 +#: rpm.c:1393 msgid "extra arguments given for verify of all packages" msgstr "" -#: rpm.c:1388 +#: rpm.c:1397 msgid "no arguments given for verify" msgstr "" @@ -1235,7 +1235,7 @@ msgstr "" msgid "cannot re-open payload: %s\n" msgstr "" -#: build/build.c:84 build/pack.c:272 +#: build/build.c:84 build/pack.c:270 msgid "Unable to open temp file" msgstr "" @@ -1417,7 +1417,7 @@ msgstr "" msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1191 build/pack.c:497 +#: build/files.c:1191 build/pack.c:495 #, c-format msgid "line: %s" msgstr "" @@ -1476,116 +1476,116 @@ msgstr "" msgid "Could not canonicalize hostname: %s\n" msgstr "" -#: build/pack.c:131 +#: build/pack.c:130 #, c-format msgid "Could not generate output filename for package %s: %s\n" msgstr "" -#: build/pack.c:148 +#: build/pack.c:147 #, c-format msgid "cannot create %s: %s\n" msgstr "" -#: build/pack.c:186 +#: build/pack.c:184 #, c-format msgid "readRPM: open %s: %s\n" msgstr "" -#: build/pack.c:196 +#: build/pack.c:194 #, c-format msgid "readRPM: read %s: %s\n" msgstr "" -#: build/pack.c:217 +#: build/pack.c:215 #, c-format msgid "readRPM: %s is not an RPM package\n" msgstr "" -#: build/pack.c:223 +#: build/pack.c:221 #, c-format msgid "readRPM: reading header from %s\n" msgstr "" -#: build/pack.c:289 +#: build/pack.c:287 msgid "Bad CSA data" msgstr "" -#: build/pack.c:328 +#: build/pack.c:326 #, c-format msgid "Could not open %s: %s\n" msgstr "" -#: build/pack.c:361 +#: build/pack.c:359 #, c-format msgid "Unable to write package: %s" msgstr "" -#: build/pack.c:376 +#: build/pack.c:374 #, c-format msgid "Generating signature: %d\n" msgstr "" -#: build/pack.c:392 +#: build/pack.c:390 #, c-format msgid "Unable to open sigtarget %s: %s" msgstr "" -#: build/pack.c:402 +#: build/pack.c:400 #, c-format msgid "Unable to read sigtarget %s: %s" msgstr "" -#: build/pack.c:412 +#: build/pack.c:410 #, c-format msgid "Unable to write package %s: %s" msgstr "" -#: build/pack.c:427 +#: build/pack.c:425 #, c-format msgid "Wrote: %s\n" msgstr "" -#: build/pack.c:446 +#: build/pack.c:444 #, c-format msgid "create archive failed on file %s: %s" msgstr "" -#: build/pack.c:465 +#: build/pack.c:463 #, c-format msgid "cpio_copy write failed: %s" msgstr "" -#: build/pack.c:472 +#: build/pack.c:470 #, c-format msgid "cpio_copy read failed: %s" msgstr "" -#: build/pack.c:553 +#: build/pack.c:551 #, c-format msgid "Could not open PreIn file: %s" msgstr "" -#: build/pack.c:560 +#: build/pack.c:558 #, c-format msgid "Could not open PreUn file: %s" msgstr "" -#: build/pack.c:567 +#: build/pack.c:565 #, c-format msgid "Could not open PostIn file: %s" msgstr "" -#: build/pack.c:574 +#: build/pack.c:572 #, c-format msgid "Could not open PostUn file: %s" msgstr "" -#: build/pack.c:582 +#: build/pack.c:580 #, c-format msgid "Could not open VerifyScript file: %s" msgstr "" -#: build/pack.c:598 +#: build/pack.c:596 #, c-format msgid "Could not open Trigger script file: %s" msgstr "" @@ -2844,7 +2844,7 @@ msgstr "" msgid "opening database mode 0x%x in %s\n" msgstr "" -#: lib/rpmdb.c:155 lib/url.c:433 +#: lib/rpmdb.c:155 lib/url.c:449 #, c-format msgid "failed to open %s: %s\n" msgstr "" @@ -3038,59 +3038,59 @@ msgstr "" msgid "Installing %s\n" msgstr "" -#: lib/rpmio.c:455 +#: lib/rpmio.c:463 msgid "Success" msgstr "" -#: lib/rpmio.c:458 +#: lib/rpmio.c:466 msgid "Bad server response" msgstr "" -#: lib/rpmio.c:461 +#: lib/rpmio.c:469 msgid "Server IO error" msgstr "" -#: lib/rpmio.c:464 +#: lib/rpmio.c:472 msgid "Server timeout" msgstr "" -#: lib/rpmio.c:467 +#: lib/rpmio.c:475 msgid "Unable to lookup server host address" msgstr "" -#: lib/rpmio.c:470 +#: lib/rpmio.c:478 msgid "Unable to lookup server host name" msgstr "" -#: lib/rpmio.c:473 +#: lib/rpmio.c:481 msgid "Failed to connect to server" msgstr "" -#: lib/rpmio.c:476 +#: lib/rpmio.c:484 msgid "Failed to establish data connection to server" msgstr "" -#: lib/rpmio.c:479 +#: lib/rpmio.c:487 msgid "IO error to local file" msgstr "" -#: lib/rpmio.c:482 +#: lib/rpmio.c:490 msgid "Error setting remote server to passive mode" msgstr "" -#: lib/rpmio.c:485 +#: lib/rpmio.c:493 msgid "File not found on server" msgstr "" -#: lib/rpmio.c:488 +#: lib/rpmio.c:496 msgid "Abort in progress" msgstr "" -#: lib/rpmio.c:492 +#: lib/rpmio.c:500 msgid "Unknown or unexpected error" msgstr "" -#: lib/rpmio.c:541 +#: lib/rpmio.c:552 #, c-format msgid "logging into %s as %s, pw %s\n" msgstr "" @@ -3389,37 +3389,37 @@ msgstr "" msgid "execution of script failed" msgstr "" -#: lib/url.c:72 +#: lib/url.c:80 #, c-format msgid "warning: u %p ctrl %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:81 +#: lib/url.c:97 #, c-format msgid "warning: u %p data %p nrefs != 0 (%s %s)\n" msgstr "" -#: lib/url.c:109 +#: lib/url.c:125 #, c-format msgid "warning: uCache[%d] %p nrefs(%d) != 1 (%s %s)\n" msgstr "" -#: lib/url.c:208 +#: lib/url.c:224 #, c-format msgid "Password for %s@%s: " msgstr "" -#: lib/url.c:233 lib/url.c:259 +#: lib/url.c:249 lib/url.c:275 #, c-format msgid "error: %sport must be a number\n" msgstr "" -#: lib/url.c:397 +#: lib/url.c:413 msgid "url port must be a number\n" msgstr "" #. XXX Fstrerror -#: lib/url.c:456 +#: lib/url.c:472 #, c-format msgid "failed to create %s: %s\n" msgstr "" diff --git a/rpm.c b/rpm.c index 33498aa..b0994af 100755 --- a/rpm.c +++ b/rpm.c @@ -56,6 +56,7 @@ static int allMatches; static int badReloc; static int excldocs; static int force; +extern int _ftp_debug; static char * ftpPort; static char * ftpProxy; static char * httpPort; @@ -78,7 +79,6 @@ static int noScripts; static int noTriggers; static int noUsageMsg; static int oldPackage; -static int showPercents; static char * pipeOutput; static char * prefix; static int queryTags; @@ -87,9 +87,12 @@ static char * rcfile; static int replaceFiles; static int replacePackages; static char * rootdir; +extern int _rpmio_debug; +static int showPercents; static int showrc; static int signIt; static int test; +extern int _url_debug; static int showVersion; extern const char * rpmNAME; @@ -116,6 +119,7 @@ static struct poptOption optionsTable[] = { { "excludedocs", '\0', 0, &excldocs, 0, NULL, NULL}, { "excludepath", '\0', POPT_ARG_STRING, 0, GETOPT_EXCLUDEPATH, NULL, NULL}, { "force", '\0', 0, &force, 0, NULL, NULL}, + { "ftpdebug", '\0', POPT_ARG_VAL, &_ftp_debug, -1, NULL, NULL}, { "ftpport", '\0', POPT_ARG_STRING, &ftpPort, 0, NULL, NULL}, { "ftpproxy", '\0', POPT_ARG_STRING, &ftpProxy, 0, NULL, NULL}, { "hash", 'h', 0, &showHash, 0, NULL, NULL}, @@ -155,12 +159,14 @@ static struct poptOption optionsTable[] = { { "replacepkgs", '\0', 0, &replacePackages, 0, NULL, NULL}, { "resign", '\0', 0, 0, GETOPT_RESIGN, NULL, NULL}, { "root", 'r', POPT_ARG_STRING, &rootdir, 0, NULL, NULL}, + { "rpmiodebug", '\0', POPT_ARG_VAL, &_rpmio_debug, -1, NULL, NULL}, { "showrc", '\0', 0, &showrc, GETOPT_SHOWRC, NULL, NULL}, { "sign", '\0', 0, &signIt, 0, NULL, NULL}, { "tarball", 't', POPT_ARG_STRING, 0, 't', NULL, NULL}, { "test", '\0', 0, &test, 0, NULL, NULL}, { "timecheck", '\0', POPT_ARG_STRING, 0, GETOPT_TIMECHECK, NULL, NULL}, { "upgrade", 'U', 0, 0, 'U', NULL, NULL}, + { "urldebug", '\0', POPT_ARG_VAL, &_url_debug, -1, NULL, NULL}, { "uninstall", 'u', 0, 0, 'u', NULL, NULL}, { "verbose", 'v', 0, 0, 'v', NULL, NULL}, { "verify", 'V', 0, 0, 'V', NULL, NULL}, @@ -569,6 +575,7 @@ int main(int argc, const char ** argv) badReloc = 0; excldocs = 0; force = 0; + _ftp_debug = 0; ftpProxy = NULL; ftpPort = NULL; httpProxy = NULL; @@ -596,13 +603,15 @@ int main(int argc, const char ** argv) prefix = NULL; queryTags = 0; quiet = 0; + _rpmio_debug = 0; replaceFiles = 0; replacePackages = 0; rootdir = "/"; showrc = 0; signIt = 0; - test = 0; showVersion = 0; + test = 0; + _url_debug = 0; /* XXX Eliminate query linkage loop */ parseSpecVec = parseSpec; -- 2.7.4