RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Apr-2008 23:06:32
Branch: HEAD Handle: 2008040221063101
Modified files:
rpm CHANGES VENDOR
rpm/lib poptALL.c
rpm/rpmio poptIO.c
Log:
- jbj: merge "no-extra-terminating-newline-on-eval" patch from
OpenPKG.
Summary:
Revision Changes Path
1.2282 +1 -0 rpm/CHANGES
2.45 +0 -19 rpm/VENDOR
2.88 +1 -3 rpm/lib/poptALL.c
1.23 +1 -3 rpm/rpmio/poptIO.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2281 -r1.2282 CHANGES
--- rpm/CHANGES 2 Apr 2008 21:03:26 -0000 1.2281
+++ rpm/CHANGES 2 Apr 2008 21:06:31 -0000 1.2282
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: merge "no-extra-terminating-newline-on-eval" patch from OpenPKG.
- jbj: merge "explicit-source-fetch-cli-option" patch from OpenPKG.
- jbj: merge "download-source-files-from-original-location" patch from
OpenPKG.
- jbj: merge "support-external-download-command" patch from OpenPKG.
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.44 -r2.45 VENDOR
--- rpm/VENDOR 2 Apr 2008 21:00:16 -0000 2.44
+++ rpm/VENDOR 2 Apr 2008 21:06:31 -0000 2.45
@@ -285,25 +285,6 @@
should be able to control verbosity manually.
________________________________________________________________________
- Change: explicit-source-fetch-cli-option
- Purpose: Provide build-time option "-bf" for just fetching
- the missing source and patch files. Additionally,
- under "-bf -v" a listing of all source/patch files
- and their file size is printed.
- Reason: In OpenPKG we want to have an CLI option for explicitly
- fetching the missing source and patch files only as
- we want to fetch at a particular controlled step
- in the packaging life-cycle (between "rpm -bt" and
- "rpm -bp").
- ________________________________________________________________________
-
- Change: no-extra-terminating-newline-on-eval
- Purpose: Do not output an extra newline on --eval '' if the
- expanded macro text already terminates with a newline
- Reason: Using e.g. rpm --eval "%{lua: print('foo\\n') }" should
- not lead to an extra trailing blank line.
- ________________________________________________________________________
-
Change: make-class-available-as-macro
Purpose: Do not treat "Class" tag as a fully arbitrary tag.
Reason: In OpenPKG some .spec processing depends on the
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.87 -r2.88 poptALL.c
--- rpm/lib/poptALL.c 23 Mar 2008 13:01:38 -0000 2.87
+++ rpm/lib/poptALL.c 2 Apr 2008 21:06:31 -0000 2.88
@@ -215,14 +215,12 @@
case 'E':
rpmcliConfigured();
{ const char *val = rpmExpand(arg, NULL);
-#if defined(RPM_VENDOR_OPENPKG) /* no-extra-terminating-newline-on-eval */
size_t val_len;
val_len = strlen(val);
if (val[val_len - 1] == '\n')
fwrite(val, val_len, 1, stdout);
else
-#endif
- fprintf(stdout, "%s\n", val);
+ fprintf(stdout, "%s\n", val);
val = _free(val);
}
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.22 -r1.23 poptIO.c
--- rpm/rpmio/poptIO.c 24 Mar 2008 20:04:17 -0000 1.22
+++ rpm/rpmio/poptIO.c 2 Apr 2008 21:06:32 -0000 1.23
@@ -227,14 +227,12 @@
case 'E':
rpmioConfigured();
{ const char *val = rpmExpand(arg, NULL);
-#if defined(RPM_VENDOR_OPENPKG) /* no-extra-terminating-newline-on-eval */
size_t val_len;
val_len = strlen(val);
if (val[val_len - 1] == '\n')
fwrite(val, val_len, 1, stdout);
else
-#endif
- fprintf(stdout, "%s\n", val);
+ fprintf(stdout, "%s\n", val);
val = _free(val);
}
break;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
