[CVS] RPM: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 19:48:29
  Branch: HEAD Handle: 2011072717482900

  Modified files:
rpm/tools   dbconvert.c

  Log:
fix help text

  Summary:
RevisionChanges Path
2.8 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.7 -r2.8 dbconvert.c
  --- rpm/tools/dbconvert.c 6 Jul 2011 12:55:30 -   2.7
  +++ rpm/tools/dbconvert.c 27 Jul 2011 17:48:29 -  2.8
  @@ -414,9 +414,9 @@
rpm root path, path},
   
 { btree, 'b', POPT_ARG_VAL,  dbType, 0,
  - swap indexes to big endian, NULL},
  + convert database type to btree, NULL},
 { hash, 'h', POPT_ARG_VAL,   dbType, 1,
  - swap indexes to little endian, NULL},
  + convert database type to hash, NULL},
   
 { bigendian, 'B', POPT_ARG_VAL,  byteOrder, 1,
swap indexes to big endian, NULL},
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 19:58:12
  Branch: rpm-5_4  Handle: 2011072717581200

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
fix help text

  Summary:
RevisionChanges Path
2.1.2.9 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.8 -r2.1.2.9 dbconvert.c
  --- rpm/tools/dbconvert.c 6 Jul 2011 13:03:42 -   2.1.2.8
  +++ rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 -  2.1.2.9
  @@ -376,9 +376,9 @@
rpm root path, path },
   
{ btree, 'b', POPT_ARG_VAL,   dbType, 0,
  - swap indexes to big endian, NULL },
  + convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL,   dbType, 1,
  - swap indexes to little endian, NULL },
  + convert database type to hash, NULL},
   
{ bigendian, 'B', POPT_ARG_VAL,   byteOrder, 1,
swap indexes to big endian, NULL },
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 20:00:25
  Branch: rpm-5_3  Handle: 2011072718002500

  Modified files:   (Branch: rpm-5_3)
rpm/tools   dbconvert.c

  Log:
fix help text

  Summary:
RevisionChanges Path
2.1.4.8 +2  -2  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.4.7 -r2.1.4.8 dbconvert.c
  --- rpm/tools/dbconvert.c 6 Jul 2011 13:03:01 -   2.1.4.7
  +++ rpm/tools/dbconvert.c 27 Jul 2011 18:00:25 -  2.1.4.8
  @@ -374,9 +374,9 @@
rpm root path, path },
   
{ btree, 'b', POPT_ARG_VAL,   dbType, 0,
  - swap indexes to big endian, NULL },
  + convert database type to btree, NULL},
{ hash, 'h', POPT_ARG_VAL,   dbType, 1,
  - swap indexes to little endian, NULL },
  + convert database type to hash, NULL},
   
{ bigendian, 'B', POPT_ARG_VAL,   byteOrder, 1,
swap indexes to big endian, NULL },
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tools/ dbconvert.c

2011-07-27 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   27-Jul-2011 20:02:02
  Branch: rpm-5_4  Handle: 2011072718020200

  Modified files:   (Branch: rpm-5_4)
rpm/tools   dbconvert.c

  Log:
add a missing null pointer check

  Summary:
RevisionChanges Path
2.1.2.10+1  -1  rpm/tools/dbconvert.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/dbconvert.c
  
  $ cvs diff -u -r2.1.2.9 -r2.1.2.10 dbconvert.c
  --- rpm/tools/dbconvert.c 27 Jul 2011 17:58:12 -  2.1.2.9
  +++ rpm/tools/dbconvert.c 27 Jul 2011 18:02:02 -  2.1.2.10
  @@ -332,7 +332,7 @@
  fn = _free(fn);
   
  /* clear locks */
  -   fn = rpmGetPath(prefix[0] ? prefix : , dbpath, /, __db.*, NULL);
  +   fn = rpmGetPath(prefix  prefix[0] ? prefix : , dbpath, /, 
__db.*, NULL);
  xx = Glob(fn, 0, NULL, gl);
  for (i = 0; i  (int)gl.gl_pathc; i++)
xx = Unlink(gl.gl_pathv[i]);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org