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

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmio/ mire.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-10-29 21:42:28
Message-ID: 20081029214228.05577A857D () 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:   29-Oct-2008 22:42:28
  Branch: rpm-5_1                          Handle: 2008102921422700

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmio               mire.c

  Log:
    - fix: permit " number %d" to be translated.

  Summary:
    Revision    Changes     Path
    1.2288.2.146+1  -0      rpm/CHANGES
    1.41.2.2    +1  -1      rpm/rpmio/mire.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.145 -r1.2288.2.146 CHANGES
  --- rpm/CHANGES	27 Oct 2008 13:30:06 -0000	1.2288.2.145
  +++ rpm/CHANGES	29 Oct 2008 21:42:27 -0000	1.2288.2.146
  @@ -1,4 +1,5 @@
   5.1.6 -> 5.1.7:
  +    - jbj: fix: permit " number %d" to be translated.
       - jbj: fix: apply _dependency_whiteout to erased relations too.
       - jbj: lua: display rudimentary info about lua with --showrc.
       - jbj: WRlua: preserve forward linkage by avoiding vmefail/get_date.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/mire.c
  ============================================================================
  $ cvs diff -u -r1.41.2.1 -r1.41.2.2 mire.c
  --- rpm/rpmio/mire.c	11 Jun 2008 20:11:42 -0000	1.41.2.1
  +++ rpm/rpmio/mire.c	29 Oct 2008 21:42:27 -0000	1.41.2.2
  @@ -566,7 +566,7 @@
   	mire->hints = pcre_study(mire->pcre, 0, &error);
   	if (error != NULL) {
   	    char s[32];
  -	    if (nmires == 1) s[0] = '\0'; else sprintf(s, " number %d", j);
  +	    if (nmires == 1) s[0] = '\0'; else sprintf(s, _(" number %d"), j);
   	    rpmlog(RPMLOG_ERR, _("%s: Error while studying regex%s: %s\n"),
   		__progname, s, error);
   	    goto exit;
  @@ .
______________________________________________________________________
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]