subject:"\[CVS\] RPM\: rpm\/lib\/ rpminstall.c"

[CVS] RPM: rpm/lib/ rpminstall.c

2010-10-17 Thread Jeff Johnson

  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:   18-Oct-2010 04:02:53
  Branch: HEAD Handle: 2010101802025200

  Modified files:
rpm/lib rpminstall.c

  Log:
- remove compiler warning, chuck debuging.

  Summary:
RevisionChanges Path
1.229   +1  -4  rpm/lib/rpminstall.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.228 -r1.229 rpminstall.c
  --- rpm/lib/rpminstall.c  29 Sep 2010 14:54:30 -  1.228
  +++ rpm/lib/rpminstall.c  18 Oct 2010 02:02:52 -  1.229
  @@ -9,6 +9,7 @@
   #include poptIO.h
   
   #include rpmtag.h
  +#define  _RPMEVR_INTERNAL/* XXX expose rpmVersionCompare 
prototype */
   #include rpmevr.h
   #include rpmdb.h
   #ifdef   NOTYET
  @@ -128,8 +129,6 @@
if (filename == NULL || filename[0] == '\0')
return NULL;
fd = Fopen(filename, r%{?_rpmgio});
  -if (_rpmts_debug)
  -fprintf(stderr, --\tfd %p = Fopen(%.40s,r)\n, fd, filename);
   
/* XXX Retry once to handle http:// server timeout reopen's. */
if (Ferror(fd)) {
  @@ -160,8 +159,6 @@
/*...@notreached@*/ break;
   
   case RPMCALLBACK_INST_CLOSE_FILE:
  -if (_rpmts_debug)
  -fprintf(stderr, --\tfd %p = Fclose(%p)\n, fd, fd);
/*...@-type@*/ /* FIX: still necessary? */
fd = fdFree(fd, persist (showProgress));
/*...@=type@*/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c tgi.c

2009-12-09 Thread Pinto Elia

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

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   09-Dec-2009 17:02:44
  Branch: HEAD Handle: 2009120916024400

  Modified files:
rpm/lib rpminstall.c tgi.c

  Log:
try to use rpmmiInstance consistently with uint32_t for the return
data type and hdrNum.

  Summary:
RevisionChanges Path
1.222   +2  -2  rpm/lib/rpminstall.c
2.27+2  -2  rpm/lib/tgi.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.221 -r1.222 rpminstall.c
  --- rpm/lib/rpminstall.c  8 Dec 2009 13:25:05 -   1.221
  +++ rpm/lib/rpminstall.c  9 Dec 2009 16:02:44 -   1.222
  @@ -343,9 +343,9 @@
return RPMRC_NOTFOUND;
   
   while ((h = rpmmiNext(mi)) != NULL) {
  - unsigned int recOffset = rpmmiInstance(mi);
  + uint32_t hdrNum = rpmmiInstance(mi);
   
  - if (recOffset == 0) {   /* XXX can't happen. */
  + if (hdrNum == 0) {  /* XXX can't happen. */
rc = RPMRC_FAIL;
break;
}
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/tgi.c
  
  $ cvs diff -u -r2.26 -r2.27 tgi.c
  --- rpm/lib/tgi.c 15 May 2009 13:40:58 -  2.26
  +++ rpm/lib/tgi.c 9 Dec 2009 16:02:44 -   2.27
  @@ -59,9 +59,9 @@
return RPMRC_NOTFOUND;
   
   while ((h = rpmmiNext(mi)) != NULL) {
  - unsigned int recOffset = rpmmiInstance(mi);
  + uint32_t hdrNum = rpmmiInstance(mi);
   
  - if (recOffset == 0) {   /* XXX can't happen. */
  + if (hdrNum == 0) {  /* XXX can't happen. */
rc = RPMRC_FAIL;
break;
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c

2009-12-09 Thread Jeff Johnson

  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:   09-Dec-2009 18:55:01
  Branch: HEAD Handle: 2009120917550100

  Modified files:
rpm/lib rpminstall.c

  Log:
- typo.

  Summary:
RevisionChanges Path
1.223   +1  -1  rpm/lib/rpminstall.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.222 -r1.223 rpminstall.c
  --- rpm/lib/rpminstall.c  9 Dec 2009 16:02:44 -   1.222
  +++ rpm/lib/rpminstall.c  9 Dec 2009 17:55:01 -   1.223
  @@ -349,7 +349,7 @@
rc = RPMRC_FAIL;
break;
}
  - xx = rpmtsAddEraseElement(ts, h, recOffset);
  + xx = rpmtsAddEraseElement(ts, h, hdrNum);
   }
   mi = rpmmiFree(mi);
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c

2009-12-08 Thread Jeff Johnson

  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:   08-Dec-2009 14:25:05
  Branch: HEAD Handle: 2009120813250500

  Modified files:
rpm/lib rpminstall.c

  Log:
- use hdrNum consistently for primary key.

  Summary:
RevisionChanges Path
1.221   +4  -5  rpm/lib/rpminstall.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.220 -r1.221 rpminstall.c
  --- rpm/lib/rpminstall.c  15 May 2009 13:40:58 -  1.220
  +++ rpm/lib/rpminstall.c  8 Dec 2009 13:25:05 -   1.221
  @@ -715,7 +715,6 @@
   
   int rpmErase(rpmts ts, QVA_t ia, const char ** argv)
   {
  -int count;
   const char ** arg;
   int numFailed = 0;
   int numRPMS = 0;
  @@ -769,9 +768,9 @@
numFailed++;
} else {
Header h;   /* XXX iterator owns the reference */
  - count = 0;
  + int count = 0;
while ((h = rpmmiNext(mi)) != NULL) {
  - unsigned int recOffset = rpmmiInstance(mi);
  + uint32_t hdrNum = rpmmiInstance(mi);
   
if (!(count++ == 0 || (ia-installInterfaceFlags  
INSTALL_ALLMATCHES))) {
rpmlog(RPMLOG_ERR, _(\%s\ specifies multiple 
packages\n),
  @@ -779,8 +778,8 @@
numFailed++;
/*...@innerbreak@*/ break;
}
  - if (recOffset) {
  - (void) rpmtsAddEraseElement(ts, h, recOffset);
  + if (hdrNum) {
  + (void) rpmtsAddEraseElement(ts, h, hdrNum);
numRPMS++;
}
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c

2007-09-03 Thread Jeff Johnson

  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:   04-Sep-2007 03:55:31
  Branch: HEAD Handle: 2007090402553100

  Modified files:
rpm/lib rpminstall.c

  Log:
rpm.org: unneeded include.

  Summary:
RevisionChanges Path
1.165   +0  -1  rpm/lib/rpminstall.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.164 -r1.165 rpminstall.c
  --- rpm/lib/rpminstall.c  21 Aug 2007 03:08:36 -  1.164
  +++ rpm/lib/rpminstall.c  4 Sep 2007 01:55:31 -   1.165
  @@ -17,7 +17,6 @@
   #include rpmts.h
   
   #include manifest.h
  -#include misc.h/* XXX rpmGlob() */
   #include rpmgi.h
   #include debug.h
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c

2007-07-21 Thread Jeff Johnson

  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:   22-Jul-2007 03:12:19
  Branch: HEAD Handle: 2007072202121800

  Modified files:
rpm/lib rpminstall.c

  Log:
revert 1.152.

  Summary:
RevisionChanges Path
1.153   +1  -1  rpm/lib/rpminstall.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.152 -r1.153 rpminstall.c
  --- rpm/lib/rpminstall.c  20 Jul 2007 16:23:36 -  1.152
  +++ rpm/lib/rpminstall.c  22 Jul 2007 01:12:18 -  1.153
  @@ -442,7 +442,7 @@
   #else
(void) mktemp(tfnbuf);
   #endif
  - tfn = rpmGenPath(rootDir, %{?_tmpdir/}, tfnbuf);
  + tfn = rpmGenPath(rootDir, %{_tmppath}/, tfnbuf);
}
   
/* XXX undefined %{name}/%{version}/%{release} here */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpminstall.c

[CVS] RPM: rpm/lib/ rpminstall.c tgi.c

[CVS] RPM: rpm/lib/ rpminstall.c

[CVS] RPM: rpm/lib/ rpminstall.c

[CVS] RPM: rpm/lib/ rpminstall.c

[CVS] RPM: rpm/lib/ rpminstall.c

6 matches

Site Navigation

Mail list logo

Footer information