RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/python/ rpmmodule.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Sun 17 Aug 2008 - 18:04:00 CEST
Message-Id: <20080817160400.A306870E1B@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:   17-Aug-2008 18:04:00
  Branch: HEAD                             Handle: 2008081716040000

  Modified files:
    rpm                     CHANGES
    rpm/python              rpmmodule.c

  Log:
    - WR: fakeroot maps devices to files. avoid /dev/* in checkfiles.

  Summary:
    Revision    Changes     Path
    1.2516      +1  -0      rpm/CHANGES
    1.174       +4  -0      rpm/python/rpmmodule.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2515 -r1.2516 CHANGES
  --- rpm/CHANGES	17 Aug 2008 15:50:46 -0000	1.2515
  +++ rpm/CHANGES	17 Aug 2008 16:04:00 -0000	1.2516
  @@ -1,5 +1,6 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: WR: Use %{_host_vendor} and %{_host_os} for platform.
       - jbj: WR: fakeroot maps devices to files. avoid /dev/* in checkfiles.
       - jbj: lua: don't exit chroot if already within running script.
       - at: gzdio: fixed and re-enabled rsyncable_gzwrite()
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/python/rpmmodule.c
  ============================================================================
  $ cvs diff -u -r1.173 -r1.174 rpmmodule.c
  --- rpm/python/rpmmodule.c	31 Jul 2008 00:21:42 -0000	1.173
  +++ rpm/python/rpmmodule.c	17 Aug 2008 16:04:00 -0000	1.174
  @@ -69,7 +69,11 @@
       if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &arch))
   	return NULL;
   
  +#if defined(RPM_VENDOR_WINDRIVER)
  +    platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL);
  +#else
       platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL);
  +#endif
       score = rpmPlatformScore(platform, NULL, 0);
       platform = _free(platform);
   
  @@ .
Received on Sun Aug 17 18:04:00 2008
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.