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: 15-Jun-2008 06:26:56
Branch: HEAD Handle: 2008061504265600
Modified files:
rpm CHANGES
rpm/lib formats.c
Log:
- fix: return 1 rather than assertion failing on Suggests: header ext
query of package with no Requires:.
Summary:
Revision Changes Path
1.2413 +2 -0 rpm/CHANGES
2.127 +3 -3 rpm/lib/formats.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2412 -r1.2413 CHANGES
--- rpm/CHANGES 14 Jun 2008 15:30:10 -0000 1.2412
+++ rpm/CHANGES 15 Jun 2008 04:26:56 -0000 1.2413
@@ -1,5 +1,7 @@
5.1.0 -> 5.2a0:
+ - jbj: fix: return 1 rather than assertion failing on Suggests: header
ext
+ query of package with no Requires:.
- rse: unbreak building without LZMAUtils library
- jbj: add --deb:foo aliases for *.deb spewage.
- jbj: rework :strsub find-and-replace to use mire patterns.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/formats.c
============================================================================
$ cvs diff -u -r2.126 -r2.127 formats.c
--- rpm/lib/formats.c 12 Mar 2008 19:41:11 -0000 2.126
+++ rpm/lib/formats.c 15 Jun 2008 04:26:56 -0000 2.127
@@ -225,7 +225,9 @@
size_t nb = 0;
int i;
-assert(ds != NULL);
+ if (ds == NULL)
+ return 1;
+
/* Collect dependencies marked as hints. */
ds = rpmdsInit(ds);
if (ds != NULL)
@@ -254,8 +256,6 @@
av = argvFree(av);
ds = rpmdsFree(ds);
- /* XXX perhaps return "(none)" inband if no suggests/enhances <shrug>. */
-
he->t = RPM_STRING_ARRAY_TYPE;
he->p.argv = argv;
he->c = argc;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
