RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-May-2009 19:35:58
Branch: HEAD Handle: 2009050317355800
Modified files:
rpm CHANGES
rpm/lib rpmds.c
Log:
- add RPMSENSE_RPMLIB to new tracking dependencies. at least
consistent even if useless.
- fix: rpmdsMerge() shouldn't leave a result that seems to have
active iteration in progress. There are side effects from macro
expanding {N,EVR} that aren't correct.
Summary:
Revision Changes Path
1.2968 +5 -0 rpm/CHANGES
2.154 +13 -13 rpm/lib/rpmds.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2967 -r1.2968 CHANGES
--- rpm/CHANGES 3 May 2009 17:24:47 -0000 1.2967
+++ rpm/CHANGES 3 May 2009 17:35:58 -0000 1.2968
@@ -1,5 +1,10 @@
5.2a4 -> 5.2b1:
+ - jbj: add RPMSENSE_RPMLIB to new tracking dependencies. at least its
+ consistent even if useless.
+ - jbj: fix: rpmdsMerge() shouldn't leave a result that seems to have
+ active iteration in progress. There are side effects from macro
+ expanding {N,EVR} that aren't correct.
- proyvind: cpuinfo: change name of '%_prefer_buildarchs' macro to
'%_prefer_target_cpu'.
- proyvind: cpuinfo: change delimiter for %_prefer_buildarchs from ':'
to ' '.
- jbj: js: add AutoFu to build --with-js=internal.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.153 -r2.154 rpmds.c
--- rpm/lib/rpmds.c 2 May 2009 13:29:34 -0000 2.153
+++ rpm/lib/rpmds.c 3 May 2009 17:35:58 -0000 2.154
@@ -1096,7 +1096,7 @@
ds->Flags = Flags;
/*...@=nullderef =nullpass =nullptrarith @*/
- ds->i = ds->Count;
+ ds->i = -1;
ds->Count++;
}
@@ -1458,54 +1458,54 @@
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package name-version-release is not implicitly provided.") },
{ "rpmlib(HeaderLoadSortsTags)", "4.0.1-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("header tags are always sorted after being loaded.") },
{ "rpmlib(ScriptletInterpreterArgs)", "4.0.3-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("the scriptlet interpreter can use arguments from header.") },
{ "rpmlib(PartialHardlinkSets)", "4.0.4-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("a hardlink file set may be installed without being complete.") },
{ "rpmlib(ConcurrentAccess)", "4.1-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package scriptlets may access the rpm database while installing.") },
#if defined(WITH_LUA)
{ "rpmlib(BuiltinLuaScripts)", "4.2.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded lua scripts.") },
#endif
#if defined(WITH_FICL)
{ "rpmlib(BuiltinFiclScripts)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded FICL.") },
#endif
#if defined(WITH_JS)
{ "rpmlib(BuiltinJavaScript)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded JavaScript.") },
#endif
#if defined(WITH_PERLEMBED)
{ "rpmlib(BuiltinPerlScripts)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded perl scripts.") },
#endif
#if defined(WITH_PYTHONEMBED)
{ "rpmlib(BuiltinPythonScripts)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded python scripts.") },
#endif
#if defined(WITH_RUBYEMBED)
{ "rpmlib(BuiltinRubyScripts)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded ruby scripts.") },
#endif
#if defined(WITH_TCL)
{ "rpmlib(BuiltinTclScripts)", "5.2-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("internal embedded tcl scripts.") },
#endif
{ "rpmlib(HeaderTagTypeInt64)", "4.4.3-1",
- ( RPMSENSE_EQUAL),
+ (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("header tag data can be of type uint64_t.") },
{ "rpmlib(PayloadIsUstar)", "4.4.4-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
