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

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/lib/ rpmrc.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2016-02-27 21:48:02
Message-ID: 20160227214802.A02B647EE6 () 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:   27-Feb-2016 22:48:02
  Branch: rpm-5_4                          Handle: 2016022721480200

  Modified files:           (Branch: rpm-5_4)
    rpm/lib                 rpmrc.c

  Log:
    Don't add the first line of /etc/rpm/platform to the list of patterns
    to match when computing an arch score, use it just for getting
    information about the platform (cpu/vendor/os). Fixes #3864.
    
    Upstream-Status: Inappropriate [embedded specific]

  Summary:
    Revision    Changes     Path
    2.289.4.11  +3  -1      rpm/lib/rpmrc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.289.4.10 -r2.289.4.11 rpmrc.c
  --- rpm/lib/rpmrc.c	27 Feb 2016 20:29:42 -0000	2.289.4.10
  +++ rpm/lib/rpmrc.c	27 Feb 2016 21:48:02 -0000	2.289.4.11
  @@ -510,6 +510,7 @@
   #endif
   	}
   
  +#if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */
   #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
   	/* do not use vendor and GNU attribution */
   	p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
  @@ -520,7 +521,8 @@
   #endif
   	xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
   	p = _free(p);
  -	
  +#endif
  +
   	init_platform++;
       }
       rc = (init_platform ? RPMRC_OK : RPMRC_FAIL);
  @@ .
______________________________________________________________________
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]