From 238dce63567daf6c4159a88fa1f6ce0ba9b70891 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 2 Jan 2012 16:18:32 +0000 Subject: (traverse) make it usefull again with rpm-4.9 git-svn-id: svn+ssh://haiku.zarb.org/home/projects/rpm4/svn/trunk@178 971eb68f-4bfb-0310-8326-d2484c010a4c --- RPM4/NEWS | 1 + RPM4/src/RPM4.xs | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/RPM4/NEWS b/RPM4/NEWS index a6a8764..3e2893d 100644 --- a/RPM4/NEWS +++ b/RPM4/NEWS @@ -1,5 +1,6 @@ - make Spec->build works with rpm-4.9 - make initdb do all the needed work +- make traverse usefull again with rpm-4.9 Version 0.26 - 21 December 2011 diff --git a/RPM4/src/RPM4.xs b/RPM4/src/RPM4.xs index 6d95edb..57a8969 100644 --- a/RPM4/src/RPM4.xs +++ b/RPM4/src/RPM4.xs @@ -1561,9 +1561,6 @@ Ts_traverse(ts, callback = NULL, sv_tagname = NULL, sv_tagvalue = NULL, keylen = #ifdef HDLISTDEBUG PRINTF_CALL; #endif -#ifdef RPM4_9_0 - croak("traverse is no more supported with rpm 4.9; unused anyway"); -#else #ifdef RPM4_9_0 ts = rpmtsLink(ts); #else @@ -1598,7 +1595,8 @@ Ts_traverse(ts, callback = NULL, sv_tagname = NULL, sv_tagvalue = NULL, keylen = exclude[i] = SvUV(*isv); } #ifdef RPM4_9_0 - rpmtsPrunedIterator(ts, exclude, av_len(av_exclude) + 1); + //FIXME: rpmtsPrunedIterator() is rpmlib internal only: + //rpmtsPrunedIterator(ts, exclude, av_len(av_exclude) + 1); #else rpmdbPruneIterator(mi, exclude, av_len(av_exclude) + 1, 0); #endif @@ -1632,7 +1630,6 @@ Ts_traverse(ts, callback = NULL, sv_tagname = NULL, sv_tagvalue = NULL, keylen = } else RETVAL = -1; ts = rpmtsFree(ts); -#endif OUTPUT: RETVAL -- cgit v1.2.1