folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 1999-12-21 17:11:43 +00:00
parent 6e704014b7
commit 3b0700f77b
4 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
build/files.c
View File

@ -1387,7 +1387,7 @@ int processSourceFiles(Spec spec)
StringBuf sourceFiles; StringBuf sourceFiles;
int x, isSpec = 1; int x, isSpec = 1;
struct FileList fl; struct FileList fl;
char *s, **files, **fp, *fn; char *s, **files, **fp;
Package pkg; Package pkg;
sourceFiles = newStringBuf(); sourceFiles = newStringBuf();
@ -1452,47 +1452,38 @@ int processSourceFiles(Spec spec)
/* The first source file is the spec file */ /* The first source file is the spec file */
x = 0; x = 0;
for (fp = files; *fp != NULL; fp++) { for (fp = files; *fp != NULL; fp++) {
const char * diskURL, *diskPath;
FileListRec *flp; FileListRec *flp;
s = *fp;
SKIPSPACE(s); diskURL = *fp;
if (! *s) SKIPSPACE(diskURL);
if (! *diskURL)
continue; continue;
flp = &fl.fileList[x]; flp = &fl.fileList[x];
flp->flags = isSpec ? RPMFILE_SPECFILE : 0; flp->flags = isSpec ? RPMFILE_SPECFILE : 0;
/* files with leading ! are no source files */ /* files with leading ! are no source files */
if (*s == '!') { if (*diskURL == '!') {
flp->flags |= RPMFILE_GHOST; flp->flags |= RPMFILE_GHOST;
s++; diskURL++;
} }
switch (urlIsURL(s)) { urlPath(diskURL, &diskPath);
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 */
}
flp->diskURL = xstrdup(s); flp->diskURL = xstrdup(diskURL);
fn = strrchr(s, '/'); diskPath = strrchr(diskPath, '/');
if (fn) if (diskPath)
fn++; diskPath++;
else else
fn = s; diskPath = diskURL;
flp->fileURL = xstrdup(fn); flp->fileURL = xstrdup(diskPath);
if (_debug) if (_debug)
fprintf(stderr, "*** PSF fileName %s diskName %s\n", flp->fileURL, flp->diskURL); fprintf(stderr, "*** PSF fileName %s diskName %s\n", flp->fileURL, flp->diskURL);
flp->verifyFlags = RPMVERIFY_ALL; flp->verifyFlags = RPMVERIFY_ALL;
stat(s, &flp->fl_st); Stat(diskURL, &flp->fl_st);
flp->uname = getUname(flp->fl_uid); flp->uname = getUname(flp->fl_uid);
flp->gname = getGname(flp->fl_gid); flp->gname = getGname(flp->fl_gid);

4
lib/install.c
View File

@ -513,7 +513,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
(void **) &archiveSizePtr, NULL)) (void **) &archiveSizePtr, NULL))
archiveSizePtr = NULL; archiveSizePtr = NULL;
chdir(realSourceDir); Chdir(realSourceDir);
if (installArchive(fd, fileCount > 0 ? files : NULL, if (installArchive(fd, fileCount > 0 ? files : NULL,
fileCount, notify, notifyData, NULL, h, fileCount, notify, notifyData, NULL, h,
specFileIndex >=0 ? NULL : &specFile, specFileIndex >=0 ? NULL : &specFile,
@ -521,7 +521,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
rc = 2; rc = 2;
goto exit; goto exit;
} }
chdir(currDir); Chdir(currDir);
if (specFileIndex == -1) { if (specFileIndex == -1) {
if (specFile == NULL) { if (specFile == NULL) {

18
po/rpm.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1421,43 +1421,43 @@ msgstr ""
msgid "line: %s" msgid "line: %s"
msgstr "" msgstr ""
#: build/files.c:1504 build/parsePrep.c:30 #: build/files.c:1495 build/parsePrep.c:30
#, c-format #, c-format
msgid "Bad owner/group: %s" msgid "Bad owner/group: %s"
msgstr "" msgstr ""
#. XXX this error message is probably not seen. #. XXX this error message is probably not seen.
#: build/files.c:1559 #: build/files.c:1550
#, c-format #, c-format
msgid "Couldn't exec %s: %s" msgid "Couldn't exec %s: %s"
msgstr "" msgstr ""
#: build/files.c:1564 #: build/files.c:1555
#, c-format #, c-format
msgid "Couldn't fork %s: %s" msgid "Couldn't fork %s: %s"
msgstr "" msgstr ""
#: build/files.c:1646 #: build/files.c:1637
#, c-format #, c-format
msgid "%s failed" msgid "%s failed"
msgstr "" msgstr ""
#: build/files.c:1650 #: build/files.c:1641
#, c-format #, c-format
msgid "failed to write all data to %s" msgid "failed to write all data to %s"
msgstr "" msgstr ""
#: build/files.c:1739 #: build/files.c:1730
#, c-format #, c-format
msgid "Finding %s: (using %s)...\n" msgid "Finding %s: (using %s)...\n"
msgstr "" msgstr ""
#: build/files.c:1767 build/files.c:1776 #: build/files.c:1758 build/files.c:1767
#, c-format #, c-format
msgid "Failed to find %s:" msgid "Failed to find %s:"
msgstr "" msgstr ""
#: build/files.c:1882 #: build/files.c:1873
#, c-format #, c-format
msgid "Processing files: %s-%s-%s\n" msgid "Processing files: %s-%s-%s\n"
msgstr "" msgstr ""

2
rpm.spec
View File

@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
Name: rpm Name: rpm
%define version 3.0.4 %define version 3.0.4
Version: %{version} Version: %{version}
Release: 0.19 Release: 0.20
Group: System Environment/Base Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
Copyright: GPL Copyright: GPL