RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/rpmio/ rpmio.c url.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 30 Jul 2007 - 04:10:54 CEST
Message-Id: <20070730021054.D3552348447@rpm5.org>
  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:   30-Jul-2007 04:10:54
  Branch: HEAD                             Handle: 2007073003105400

  Modified files:
    rpm/rpmio               rpmio.c url.c

  Log:
    no i18n for debug msgs.

  Summary:
    Revision    Changes     Path
    1.92        +2  -2      rpm/rpmio/rpmio.c
    1.40        +2  -2      rpm/rpmio/url.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.91 -r1.92 rpmio.c
  --- rpm/rpmio/rpmio.c	15 Jul 2007 16:32:17 -0000	1.91
  +++ rpm/rpmio/rpmio.c	30 Jul 2007 02:10:54 -0000	1.92
  @@ -1618,7 +1618,7 @@
   	fd = fdLink(fd, "grab ctrl (urlConnect FTP)");
   
   	if (fdFileno(u->ctrl) < 0) {
  -	    rpmMessage(RPMMESS_DEBUG, _("logging into %s as %s, pw %s\n"),
  +	    rpmMessage(RPMMESS_DEBUG, D_("logging into %s as %s, pw %s\n"),
   			u->host ? u->host : "???",
   			u->user ? u->user : "ftp",
   			u->password ? u->password : "(username)");
  @@ -3743,7 +3743,7 @@
       }
       rc = 0;
       if (created)
  -	rpmMessage(RPMMESS_DEBUG, "created directory(s) %s mode 0%o\n",
  +	rpmMessage(RPMMESS_DEBUG, D_("created directory(s) %s mode 0%o\n"),
   			path, mode);
       return rc;
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/url.c
  ============================================================================
  $ cvs diff -u -r1.39 -r1.40 url.c
  --- rpm/rpmio/url.c	10 Jul 2007 12:50:02 -0000	1.39
  +++ rpm/rpmio/url.c	30 Jul 2007 02:10:54 -0000	1.40
  @@ -546,7 +546,7 @@
   	
       sfd = Fopen(url, "r");
       if (sfd == NULL || Ferror(sfd)) {
  -	rpmMessage(RPMMESS_DEBUG, _("failed to open %s: %s\n"), url, Fstrerror(sfd));
  +	rpmMessage(RPMMESS_DEBUG, D_("failed to open %s: %s\n"), url, Fstrerror(sfd));
   	rc = FTPERR_UNKNOWN;
   	goto exit;
       }
  @@ -566,7 +566,7 @@
   if (_url_debug)
   fprintf(stderr, "*** urlGetFile sfd %p %s tfd %p %s\n", sfd, url, (tfd ? tfd : NULL), dest);
       if (tfd == NULL || Ferror(tfd)) {
  -	rpmMessage(RPMMESS_DEBUG, _("failed to create %s: %s\n"), dest, Fstrerror(tfd));
  +	rpmMessage(RPMMESS_DEBUG, D_("failed to create %s: %s\n"), dest, Fstrerror(tfd));
   	rc = FTPERR_UNKNOWN;
   	goto exit;
       }
  @@ .
Received on Mon Jul 30 04:10:54 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.