[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ CHANGES rpm/lib/ librpm.vers rpm/python/ rpmts-py.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2007-10-31 19:21:13
Message-ID: 20071031192114.04E9234845F () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   31-Oct-2007 20:21:13
  Branch: HEAD                             Handle: 2007103119211300

  Modified files:
    rpm                     CHANGES
    rpm/lib                 librpm.vers
    rpm/python              rpmts-py.c

  Log:
    - jbj: update loader maps for python lazy loads. rpm-python fixing to
    do.

  Summary:
    Revision    Changes     Path
    1.1759      +1  -0      rpm/CHANGES
    1.22        +6  -2      rpm/lib/librpm.vers
    1.76        +4  -4      rpm/python/rpmts-py.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1758 -r1.1759 CHANGES
  --- rpm/CHANGES	26 Oct 2007 20:50:20 -0000	1.1758
  +++ rpm/CHANGES	31 Oct 2007 19:21:13 -0000	1.1759
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - jbj: update loader maps for python lazy loads. rpm-python fixing to do.
       - jbj: insturment headerNextIterator() statistics.
       - jbj: trade a double free for a modest memory leak for the moment.
       - jbj: fix: install modes broken by forgetting to add '\0'.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/librpm.vers
  ============================================================================
  $ cvs diff -u -r1.21 -r1.22 librpm.vers
  --- rpm/lib/librpm.vers	13 Oct 2007 08:42:08 -0000	1.21
  +++ rpm/lib/librpm.vers	31 Oct 2007 19:21:13 -0000	1.22
  @@ -230,11 +230,15 @@
       rpmpsCreate;
       _rpmps_debug;
       rpmpsFree;
  +    rpmpsFreeIterator;
  +    rpmpsInitIterator;
  +    rpmpsNextIterator;
       rpmpsmFree;
       rpmpsmNew;
       rpmpsmStage;
       rpmpsNumProblems;
       rpmpsPrint;
  +    rpmpsProblem;
       rpmpsTrim;
       rpmProblemGetAltNEVR;
       rpmProblemGetType;
  @@ -334,7 +338,7 @@
       rpmtsCreate;
       rpmtsCurrDir;
       _rpmts_debug;
  -    rpmtsDbmode;
  +    rpmtsDBMode;
       rpmtsDFlags;
       rpmtsDoARBGoal;
       rpmtsElement;
  @@ -370,7 +374,7 @@
       rpmtsSetChrootDone;
       rpmtsSetColor;
       rpmtsSetCurrDir;
  -    rpmtsSetDbmode;
  +    rpmtsSetDBMode;
       rpmtsSetDFlags;
       rpmtsSetFlags;
       rpmtsSetGoal;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmts-py.c
  ============================================================================
  $ cvs diff -u -r1.75 -r1.76 rpmts-py.c
  --- rpm/python/rpmts-py.c	25 Oct 2007 15:06:39 -0000	1.75
  +++ rpm/python/rpmts-py.c	31 Oct 2007 19:21:13 -0000	1.76
  @@ -799,10 +799,10 @@
   if (_rpmts_debug)
   fprintf(stderr, "*** rpmts_OpenDB(%p) ts %p\n", s, s->ts);
   
  -    if (rpmtsDbmode(s->ts) == -1)
  -	(void) rpmtsSetDbmode(s->ts, O_RDONLY);
  +    if (rpmtsDBMode(s->ts) == -1)
  +	(void) rpmtsSetDBMode(s->ts, O_RDONLY);
   
  -    return Py_BuildValue("i", rpmtsOpenDB(s->ts, rpmtsDbmode(s->ts)));
  +    return Py_BuildValue("i", rpmtsOpenDB(s->ts, rpmtsDBMode(s->ts)));
   }
   
   /**
  @@ -818,7 +818,7 @@
   fprintf(stderr, "*** rpmts_CloseDB(%p) ts %p\n", s, s->ts);
   
       rc = rpmtsCloseDB(s->ts);
  -    (void) rpmtsSetDbmode(s->ts, -1);		/* XXX disable lazy opens */
  +    (void) rpmtsSetDBMode(s->ts, -1);		/* XXX disable lazy opens */
   
       return Py_BuildValue("i", rc);
   }
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]