diff options
| author | jbj <devnull@localhost> | 1998-11-19 18:10:28 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1998-11-19 18:10:28 +0000 |
| commit | dc7ee4090deb5638aee8837f7cad73840cf74e5f (patch) | |
| tree | b8cd581593e4b4cb6aa1edf340b8156403222855 /build | |
| parent | 2578b7fc8451f06f83640b448bda098e295447cb (diff) | |
| download | rpm-dc7ee4090deb5638aee8837f7cad73840cf74e5f.tar.gz rpm-dc7ee4090deb5638aee8837f7cad73840cf74e5f.tar.bz2 rpm-dc7ee4090deb5638aee8837f7cad73840cf74e5f.zip | |
finish hiding rpmdb index record data ("matches").
CVS patchset: 2543
CVS date: 1998/11/19 18:10:28
Diffstat (limited to 'build')
| -rw-r--r-- | build/files.c | 4 | ||||
| -rw-r--r-- | build/pack.c | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/build/files.c b/build/files.c index c4f6ff2d8..3d2dccf34 100644 --- a/build/files.c +++ b/build/files.c @@ -1451,8 +1451,8 @@ static StringBuf getOutputFrom(char *dir, char *argv[], close(toProg[1]); close(fromProg[0]); - dup2(toProg[0], 0); /* Make stdin the in pipe */ - dup2(fromProg[1], 1); /* Make stdout the out pipe */ + dup2(toProg[0], STDIN_FILENO); /* Make stdin the in pipe */ + dup2(fromProg[1], STDOUT_FILENO); /* Make stdout the out pipe */ close(toProg[0]); close(fromProg[1]); diff --git a/build/pack.c b/build/pack.c index e21f28e4e..986456791 100644 --- a/build/pack.c +++ b/build/pack.c @@ -56,6 +56,11 @@ int packageSources(Spec spec) headerAddEntry(spec->sourceHeader, RPMTAG_BUILDTIME, RPM_INT32_TYPE, getBuildTime(), 1); + { int capability = 0; + headerAddEntry(spec->sourceHeader, RPMTAG_CAPABILITY, RPM_INT32_TYPE, + &capability, 1); + } + genSourceRpmName(spec); /* XXX this should be %_srpmdir */ @@ -127,6 +132,11 @@ int packageBinaries(Spec spec) headerAddEntry(pkg->header, RPMTAG_BUILDTIME, RPM_INT32_TYPE, getBuildTime(), 1); + { int capability = 0; + headerAddEntry(pkg->header, RPMTAG_CAPABILITY, RPM_INT32_TYPE, + &capability, 1); + } + genSourceRpmName(spec); headerAddEntry(pkg->header, RPMTAG_SOURCERPM, RPM_STRING_TYPE, spec->sourceRpmName, 1); @@ -174,7 +184,7 @@ int readRPM(char *fileName, Spec *specp, struct rpmlead *lead, Header *sigs, strerror(errno)); return RPMERR_BADMAGIC; } else { - fdi = fdDup(0); + fdi = fdDup(STDIN_FILENO); } /* Get copy of lead */ |