RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarl...@rpm5.org
  Module: rpm                              Date:   14-May-2011 22:39:12
  Branch: rpm-5_3                          Handle: 2011051420391101

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/rpmio               iosm.c

  Log:
    fix assertion error when trying to install packages without required
    permissions.

  Summary:
    Revision    Changes     Path
    1.3296.2.231+2  -0      rpm/CHANGES
    1.42.2.3    +2  -1      rpm/rpmio/iosm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.230 -r1.3296.2.231 CHANGES
  --- rpm/CHANGES       11 May 2011 12:53:32 -0000      1.3296.2.230
  +++ rpm/CHANGES       14 May 2011 20:39:11 -0000      1.3296.2.231
  @@ -1,4 +1,6 @@
   5.3.11 -> 5.3.12
  +    - proyvind: fix assertion error when trying to install packages without
  +     required permissions.
       - devzero2000: add openmamba macro to the rpm spec file
       - devzero2000: add openmamba macro to configure.ac so it is 
distributable.
         Also use AC_SUBSTS RPMCANONVENDOR configure variable in openmanba.in  
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/iosm.c
  ============================================================================
  $ cvs diff -u -r1.42.2.2 -r1.42.2.3 iosm.c
  --- rpm/rpmio/iosm.c  29 Sep 2010 15:33:11 -0000      1.42.2.2
  +++ rpm/rpmio/iosm.c  14 May 2011 20:39:12 -0000      1.42.2.3
  @@ -2630,7 +2630,8 @@
            rc = IOSMERR_OPEN_FAILED;
        }
   #if defined(POSIX_FADV_DONTNEED)
  -     (void) Fadvise(iosm->wfd, 0, 0, POSIX_FADV_DONTNEED);
  +     else
  +         (void) Fadvise(iosm->wfd, 0, 0, POSIX_FADV_DONTNEED);
   #endif
        if (iosm->debug && (stage & IOSM_SYSCALL))
            rpmlog(RPMLOG_DEBUG, " %8s (%s, \"w\") wfd %p wrbuf %p\n", cur,
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to