lib/rpmio.c: Start weeding the debug messages.
lib/rpmio.c: Functional HTTP PUT. CVS patchset: 3493 CVS date: 1999/12/21 17:11:43
This commit is contained in:
jbj
parent
6e704014b7
commit
3b0700f77b
|
|
@ -1387,7 +1387,7 @@ int processSourceFiles(Spec spec)
|
|||
StringBuf sourceFiles;
|
||||
int x, isSpec = 1;
|
||||
struct FileList fl;
|
||||
char *s, **files, **fp, *fn;
|
||||
char *s, **files, **fp;
|
||||
Package pkg;
|
||||
|
||||
sourceFiles = newStringBuf();
|
||||
|
|
@ -1452,47 +1452,38 @@ int processSourceFiles(Spec spec)
|
|||
/* The first source file is the spec file */
|
||||
x = 0;
|
||||
for (fp = files; *fp != NULL; fp++) {
|
||||
const char * diskURL, *diskPath;
|
||||
FileListRec *flp;
|
||||
s = *fp;
|
||||
SKIPSPACE(s);
|
||||
if (! *s)
|
||||
|
||||
diskURL = *fp;
|
||||
SKIPSPACE(diskURL);
|
||||
if (! *diskURL)
|
||||
continue;
|
||||
|
||||
flp = &fl.fileList[x];
|
||||
|
||||
flp->flags = isSpec ? RPMFILE_SPECFILE : 0;
|
||||
/* files with leading ! are no source files */
|
||||
if (*s == '!') {
|
||||
if (*diskURL == '!') {
|
||||
flp->flags |= RPMFILE_GHOST;
|
||||
s++;
|
||||
diskURL++;
|
||||
}
|
||||
|
||||
switch (urlIsURL(s)) {
|
||||
case URL_IS_PATH: /* file://... */
|
||||
s += sizeof("file://") - 1;
|
||||
s = strchr(s, '/');
|
||||
/*@fallthrough@*/
|
||||
case URL_IS_UNKNOWN: /* plain file path */
|
||||
break;
|
||||
case URL_IS_DASH: /* stdin */
|
||||
case URL_IS_FTP: /* ftp://... */
|
||||
case URL_IS_HTTP: /* http://... */
|
||||
continue; /* XXX WRONG WRONG WRONG */
|
||||
}
|
||||
urlPath(diskURL, &diskPath);
|
||||
|
||||
flp->diskURL = xstrdup(s);
|
||||
fn = strrchr(s, '/');
|
||||
if (fn)
|
||||
fn++;
|
||||
flp->diskURL = xstrdup(diskURL);
|
||||
diskPath = strrchr(diskPath, '/');
|
||||
if (diskPath)
|
||||
diskPath++;
|
||||
else
|
||||
fn = s;
|
||||
diskPath = diskURL;
|
||||
|
||||
flp->fileURL = xstrdup(fn);
|
||||
flp->fileURL = xstrdup(diskPath);
|
||||
if (_debug)
|
||||
fprintf(stderr, "*** PSF fileName %s diskName %s\n", flp->fileURL, flp->diskURL);
|
||||
flp->verifyFlags = RPMVERIFY_ALL;
|
||||
|
||||
stat(s, &flp->fl_st);
|
||||
Stat(diskURL, &flp->fl_st);
|
||||
|
||||
flp->uname = getUname(flp->fl_uid);
|
||||
flp->gname = getGname(flp->fl_gid);
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
|
|||
(void **) &archiveSizePtr, NULL))
|
||||
archiveSizePtr = NULL;
|
||||
|
||||
chdir(realSourceDir);
|
||||
Chdir(realSourceDir);
|
||||
if (installArchive(fd, fileCount > 0 ? files : NULL,
|
||||
fileCount, notify, notifyData, NULL, h,
|
||||
specFileIndex >=0 ? NULL : &specFile,
|
||||
|
|
@ -521,7 +521,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
|
|||
rc = 2;
|
||||
goto exit;
|
||||
}
|
||||
chdir(currDir);
|
||||
Chdir(currDir);
|
||||
|
||||
if (specFileIndex == -1) {
|
||||
if (specFile == NULL) {
|
||||
|
|
|
|||
18
po/rpm.pot
18
po/rpm.pot
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 1999-12-19 14:28-0500\n"
|
||||
"POT-Creation-Date: 1999-12-21 12:08-0500\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -1421,43 +1421,43 @@ msgstr ""
|
|||
msgid "line: %s"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1504 build/parsePrep.c:30
|
||||
#: build/files.c:1495 build/parsePrep.c:30
|
||||
#, c-format
|
||||
msgid "Bad owner/group: %s"
|
||||
msgstr ""
|
||||
|
||||
#. XXX this error message is probably not seen.
|
||||
#: build/files.c:1559
|
||||
#: build/files.c:1550
|
||||
#, c-format
|
||||
msgid "Couldn't exec %s: %s"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1564
|
||||
#: build/files.c:1555
|
||||
#, c-format
|
||||
msgid "Couldn't fork %s: %s"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1646
|
||||
#: build/files.c:1637
|
||||
#, c-format
|
||||
msgid "%s failed"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1650
|
||||
#: build/files.c:1641
|
||||
#, c-format
|
||||
msgid "failed to write all data to %s"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1739
|
||||
#: build/files.c:1730
|
||||
#, c-format
|
||||
msgid "Finding %s: (using %s)...\n"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1767 build/files.c:1776
|
||||
#: build/files.c:1758 build/files.c:1767
|
||||
#, c-format
|
||||
msgid "Failed to find %s:"
|
||||
msgstr ""
|
||||
|
||||
#: build/files.c:1882
|
||||
#: build/files.c:1873
|
||||
#, c-format
|
||||
msgid "Processing files: %s-%s-%s\n"
|
||||
msgstr ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue