[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am

[Jeff Johnson]

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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  j...@rpm5.org
  Module: rpm                              Date:   01-Mar-2012 05:25:49
  Branch: rpm-5_4                          Handle: 2012030104254900

  Modified files:           (Branch: rpm-5_4)
    rpm/tests               Makefile.am

  Log:
    - harden Install-FOO and Verify-FOO against some errors.

  Summary:
    Revision    Changes     Path
    1.95.2.39   +10 -2      rpm/tests/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.95.2.38 -r1.95.2.39 Makefile.am
  --- rpm/tests/Makefile.am     1 Mar 2012 03:39:03 -0000       1.95.2.38
  +++ rpm/tests/Makefile.am     1 Mar 2012 04:25:49 -0000       1.95.2.39
  @@ -748,6 +748,12 @@
          -D '_solve_A $(<D)/solve' \
          --noparentdirs --nolinktos \
          $(<D)/todo.random 2>&1 | tee -a $(<D)/install
  +     -${sudo} rm -f $(<D)/ROOT/var/lib/rpm/Filepaths
  +     -${sudo} ${rpm} -qf /bin/sh --stats \
  +       -D '_dbpath $(testdir)/$(<D)/ROOT/var/lib/rpm'
  +     -${sudo} rm -f $(<D)/ROOT/var/lib/rpm/Providename
  +     -${sudo} ${rpm} -q --whatprovides kernel  --stats \
  +       -D '_dbpath $(testdir)/$(<D)/ROOT/var/lib/rpm'
        -${sudo} ${rpm} -Va --nofiles --noaid --stats \
          -D '_dbpath $(testdir)/$(<D)/ROOT/var/lib/rpm' \
          --noparentdirs --nolinktos \
  @@ -759,7 +765,7 @@
   #    @rm -f $(<D)/todo.random
        @echo "`$(now)` <== $(<D): Installed." | tee -a $(<D)/install
        @-[ -d $(<D)/ROOT/tmp/.private ] && $(chattr) -a $(<D)/ROOT/tmp/.private
  -     @-sudo rm -rf $(<D)/ROOT/
  +     @-${sudo} rm -rf $(<D)/ROOT/
        @-./spew $(<D) > $(<D)/install.mongo
   #    @-${mongo} ${mongoserver} < ${<D}/install.mongo
   
  @@ -789,8 +795,10 @@
            -D '_dbpath /var/lib/rpm' \
            -D '_hrmib_path /var/cache/hrmib/%{___NVRA}' \
            -D '_repackage_all_erasures 0' \
  -         `${rpm} -D '_dbpath $(testdir)/$(<D)/VROOT/var/lib/rpm' -qa` \
  +         `${sudo} ${rpm} -D '_dbpath $(testdir)/$(<D)/VROOT/var/lib/rpm' 
-qa` \
          2>&1 || : ; \
  +       [ -d $(<D)/VROOT/tmp/.private ] && $(chattr) -a 
$(<D)/VROOT/tmp/.private ; \
  +       ${sudo} rm -rf $(<D)/VROOT/ ; \
        done | tee -a $(<D)/verify
        @echo "`$(now)` <== ${<D}: Verified." | tee -a $(<D)/verify
   
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org