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

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_1: rpm/lib/ depends.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-08-22 6:10:29
Message-ID: 20080822061029.8CEAD7BB95 () 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:   22-Aug-2008 08:10:29
  Branch: rpm-5_1                          Handle: 2008082206102900

  Modified files:           (Branch: rpm-5_1)
    rpm/lib                 depends.c

  Log:
    - jbj: oops.

  Summary:
    Revision    Changes     Path
    1.394.2.9   +2  -2      rpm/lib/depends.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.394.2.8 -r1.394.2.9 depends.c
  --- rpm/lib/depends.c	22 Aug 2008 04:46:47 -0000	1.394.2.8
  +++ rpm/lib/depends.c	22 Aug 2008 06:10:29 -0000	1.394.2.9
  @@ -256,10 +256,10 @@
   	    const char * oharch;
   	    he->tag = RPMTAG_ARCH;
   	    xx = headerGet(h, he, 0);
  -	    arch = (xx && he->p.str != NULL ? he->p.str : NULL)
  +	    arch = (xx && he->p.str != NULL ? he->p.str : NULL);
   	    he->tag = RPMTAG_ARCH;
   	    xx = headerGet(oh, he, 0);
  -	    oharch = (xx && he->p.str != NULL ? he->p.str : NULL)
  +	    oharch = (xx && he->p.str != NULL ? he->p.str : NULL);
   	    if (arch != NULL && oharch != NULL) {
   	        if (strcmp("noarch", arch) || strcmp("noarch", oharch)) {
   		    if (!_isCompatibleArch(arch, oharch)) {
  @@ .
______________________________________________________________________
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]