folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- resurrect availablePackages one more time. 

CVS patchset: 5871
CVS date: 2002/11/15 21:10:32
This commit is contained in:
jbj 2002-11-15 21:10:32 +00:00
parent 2dc6fe0505
commit 362d1ae73f
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -23,6 +23,7 @@
- update to elfutils-0.56.
- have debug sub-subpackage use external, not internal, elfutils.
- apply patches 1-6 to db-4.1.24.
- resurrect availablePackages one more time.
4.0.4 -> 4.1:
- loosely wire beecrypt library into rpm.

2
elfutils/po/elfutils.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2002-11-15 13:34-0500\n"
"POT-Creation-Date: 2002-11-15 16:10-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

14
python/rpmts-py.c
View File

@ -221,7 +221,7 @@ rpmts_AddInstall(rpmtsObject * s, PyObject * args)
}
if (_rpmts_debug < 0 || (_rpmts_debug > 0 && *how != 'a'))
fprintf(stderr, "*** rpmts_AddInstall(%p) ts %p\n", s, s->ts);
fprintf(stderr, "*** rpmts_AddInstall(%p,%p,%p,%s) ts %p\n", s, h, key, how, s->ts);
if (how && strcmp(how, "a") && strcmp(how, "u") && strcmp(how, "i")) {
PyErr_SetString(PyExc_TypeError, "how argument must be \"u\", \"a\", or \"i\"");
@ -307,10 +307,10 @@ fprintf(stderr, "*** rpmts_AddErase(%p) ts %p\n", s, s->ts);
/** \ingroup python
*/
static int
rpmts_SolveCallback(rpmts ts, rpmds ds, void * data)
rpmts_SolveCallback(rpmts ts, rpmds ds, const void * data)
/*@*/
{
struct rpmtsCallbackType_s * cbInfo = data;
struct rpmtsCallbackType_s * cbInfo = (struct rpmtsCallbackType_s *) data;
PyObject * args, * result;
int res = 1;
@ -343,7 +343,7 @@ fprintf(stderr, "*** rpmts_SolveCallback(%p,%p,%p) \"%s\"\n", ts, ds, data, rpmd
static long hdr_hash(hdrObject *h)
{
return h;
return (long) h;
}
/** \ingroup python
@ -379,12 +379,14 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
cbInfo.pythonError = 0;
cbInfo._save = PyEval_SaveThread();
/* XXX resurrect availablePackages one more time ... */
rpmalMakeIndex(&s->ts->availablePackages);
xx = rpmtsCheck(s->ts);
ps = rpmtsProblems(s->ts);
if (cbInfo.cb) {
if (cbInfo.cb)
xx = rpmtsSetSolveCallback(s->ts, rpmtsSolve, NULL);
}
PyEval_RestoreThread(cbInfo._save);

5
rpm.spec.in
View File

@ -16,7 +16,7 @@ Name: rpm
%define version @VERSION@
Version: %{version}
%{expand: %%define rpm_version %{version}}
Release: 0.9
Release: 0.10
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
Copyright: GPL
@ -481,10 +481,11 @@ exit 0
%{__prefix}/include/popt.h
%changelog
* Fri Nov 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.9
* Fri Nov 15 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.10
- update to elfutils-0.56.
- have debug sub-subpackage use external, not internal, elfutils.
- apply patches 1-6 to db-4.1.24.
- resurrect availablePackages one more time.
* Wed Nov 13 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.8
- fix: bash must have functional libtermcap.so.2.