[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-05-25 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:   25-May-2011 14:52:22
  Branch: rpm-5_3  Handle: 2011052512522100

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
bring back syslog patch forgotten on rpm-5_2 branch (mdvbz#63318)

  Summary:
RevisionChanges Path
2.394.2.11  +22 -0  rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.10 -r2.394.2.11 psm.c
  --- rpm/lib/psm.c 9 Apr 2011 23:02:04 -   2.394.2.10
  +++ rpm/lib/psm.c 25 May 2011 12:52:21 -  2.394.2.11
  @@ -3070,6 +3070,17 @@
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi-h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
  +#if defined(HAVE_SYSLOG_H)  defined(RPM_VENDOR_MANDRIVA) /* 
log-install-remove-to-syslog */
  + {
  + char *s, fmt;
  + fmt = rpmExpand(%{___NVRA}, NULL);
  + s = headerSprintf(fi-h, fmt,
  + rpmTagTable, rpmHeaderFormats, NULL);
  + syslog(LOG_NOTICE, [RPM] %s installed\n, s);
  + fmt = _free(fmt);
  + s = _free(s);
  + }
  +#endif
}
   
if (rc != RPMRC_OK) {
  @@ -3099,6 +3110,17 @@
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi-record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
  +#if defined(HAVE_SYSLOG_H)  defined(RPM_VENDOR_MANDRIVA) /* 
log-install-remove-to-syslog */
  +{
  + char *s, fmt;
  + fmt = rpmExpand(%{___NVRA}, NULL);
  + s = headerSprintf(fi-h, fmt,
  + rpmTagTable, rpmHeaderFormats, NULL);
  + syslog(LOG_NOTICE, [RPM] %s removed\n, s);
  + fmt = _free(fmt);
  + s = _free(s);
  + }
  +#endif
   
if (rc != RPMRC_OK) {
xx = rpmtxnAbort(rpmtsGetRdb(ts)-db_txn);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-04-09 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:   10-Apr-2011 01:02:05
  Branch: rpm-5_3  Handle: 2011040923020400

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
fix file trigger hack for firing way too many times on mandriva

  Summary:
RevisionChanges Path
2.394.2.10  +5  -15 rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.9 -r2.394.2.10 psm.c
  --- rpm/lib/psm.c 25 Mar 2011 15:13:34 -  2.394.2.9
  +++ rpm/lib/psm.c 9 Apr 2011 23:02:04 -   2.394.2.10
  @@ -1476,22 +1476,8 @@
/*@innercontinue@*/ continue;
rc |= handleOneTrigger(psm, fi-h, triggeredH, arg2);
prev = instance;
  -
  -#if !defined(RPM_VENDOR_MANDRIVA)
  - /*
  -  * FIXME: 'instances' is never really used for anything later,
  -  * and seems to have some bug making it eat it all memory
  -  */
xx = argiAdd(instances, -1, instance);
xx = argiSort(instances, NULL);
  -#else
  - /* As no filenames or anything is passed to the trigger script,
  -  * there doesn't seem to be any reason to fire the same trigger
  -  * over and over..
  -  */
  - if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
  - break;
  -#endif
}
   
mi = rpmmiFree(mi);
  @@ -1634,8 +1620,12 @@
if (tagno != RPMTAG_NAME) {
/* XXX if trigger name ends with '/', use dirnames instead. */
if (N[0] == '/') 
  - tagno = (N[strlen(N)-1] == '/')
  +#if defined(RPM_VENDOR_MANDRIVA)
  + continue;
  +#else
  + tagno = (N[strlen(N)-1] == '/')
? RPMTAG_DIRNAMES : RPMTAG_FILEPATHS;
  +#endif
}
/* XXX For now, permit globs only in unversioned triggers. */
if ((EVR == NULL || *EVR == '\0')  Glob_pattern_p(N, 0))
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-03-25 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:   25-Mar-2011 15:33:34
  Branch: rpm-5_3  Handle: 2011032514333400

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
fix mandriva hack to workaround file triggers issue

  Summary:
RevisionChanges Path
2.394.2.8   +2  -4  rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.7 -r2.394.2.8 psm.c
  --- rpm/lib/psm.c 24 Mar 2011 16:55:06 -  2.394.2.7
  +++ rpm/lib/psm.c 25 Mar 2011 14:33:34 -  2.394.2.8
  @@ -1489,17 +1489,15 @@
 * there doesn't seem to be any reason to fire the same trigger
 * over and over..
 */
  - if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
  + if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
break;
  - xx = argiAdd(instances, -1, instance);
  - xx = argiSort(instances, NULL);
   #endif
}
   
mi = rpmmiFree(mi);
   #if defined(RPM_VENDOR_MANDRIVA)
/* again don't fire same trigger over and over.. */
  - if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
  + if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
break;
   #endif
   }
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-03-25 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:   25-Mar-2011 16:13:34
  Branch: rpm-5_3  Handle: 2011032515133400

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
drop part of mandriva hackaround for file triggers which I don't get
how could've ever even worked in the first place

  Summary:
RevisionChanges Path
2.394.2.9   +0  -5  rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.8 -r2.394.2.9 psm.c
  --- rpm/lib/psm.c 25 Mar 2011 14:33:34 -  2.394.2.8
  +++ rpm/lib/psm.c 25 Mar 2011 15:13:34 -  2.394.2.9
  @@ -1495,11 +1495,6 @@
}
   
mi = rpmmiFree(mi);
  -#if defined(RPM_VENDOR_MANDRIVA)
  - /* again don't fire same trigger over and over.. */
  - if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
  - break;
  -#endif
   }
   
   instances = argiFree(instances);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-03-24 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:   24-Mar-2011 17:47:31
  Branch: rpm-5_3  Handle: 2011032416473100

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
commit non-pre-scripts-dont-fail patch from mandriva under #ifdef

  Summary:
RevisionChanges Path
2.394.2.6   +12 -8  rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.5 -r2.394.2.6 psm.c
  --- rpm/lib/psm.c 29 Dec 2010 15:04:06 -  2.394.2.5
  +++ rpm/lib/psm.c 24 Mar 2011 16:47:31 -  2.394.2.6
  @@ -2178,6 +2178,10 @@
   rpmRC rc = psm-rc;
   int saveerrno;
   int xx;
  +int non_pre_scripts_dont_fail = 0;
  +#if defined(RPM_VENDOR_MANDRIVA)
  +non_pre_scripts_dont_fail = 
rpmExpandNumeric(%{?_legacy_compat_non_pre_scripts_dont_fail});
  +#endif
   
   /* XXX hackery to assert(!scareMem) in rpmfiNew. */
   /*@-castexpose@*/
  @@ -2399,11 +2403,11 @@
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOTRIGGERUN)) {
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
   
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOPREUN))
  @@ -2743,16 +2747,16 @@
   
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOPOST)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOTRIGGERIN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
   
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
}
   
/*
  @@ -2785,17 +2789,17 @@
   
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOPOSTUN)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
   
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc  !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts)  RPMTRANS_FLAG_APPLYONLY))
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2010-10-18 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 08:56:43
  Branch: rpm-5_3  Handle: 2010101806564300

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
- remove compiler warning.

  Summary:
RevisionChanges Path
2.394.2.4   +1  -1  rpm/lib/psm.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.3 -r2.394.2.4 psm.c
  --- rpm/lib/psm.c 18 Sep 2010 19:47:29 -  2.394.2.3
  +++ rpm/lib/psm.c 18 Oct 2010 06:56:43 -  2.394.2.4
  @@ -1390,7 +1390,7 @@
if (!Glob_pattern_p(t, 0))
continue;
xx = mireAppend(RPMMIRE_GLOB, 0, t, NULL,
  - (miRE *)psm-Tmires, psm-nTmires);
  + (void *)psm-Tmires, psm-nTmires);
xx = argvAdd(psm-Tpats, t);
   }
   keys = argvFree(keys);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org