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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   09-Nov-2007 02:06:44
  Branch: HEAD                             Handle: 2007110901064400

  Modified files:
    rpm                     devtool.conf

  Log:
    make perl/python cleanup section less noisy (but still as ugly)

  Summary:
    Revision    Changes     Path
    2.121       +10 -10     rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.120 -r2.121 devtool.conf
  --- rpm/devtool.conf  9 Nov 2007 00:39:42 -0000       2.120
  +++ rpm/devtool.conf  9 Nov 2007 01:06:44 -0000       2.121
  @@ -1768,20 +1768,20 @@
       python_version=`( grep -a ^WITH_PYTHON_VERSION config.log; echo 'echo 
$WITH_PYTHON_VERSION' ) | sh`
       mkdir -p /tmp/rpm-root/Library/Python/$python_version
       mv /tmp/rpm-root/Library/Frameworks/Python.framework/Versions/* \
  -       /tmp/rpm-root/Library/Python/
  -    rm -r /tmp/rpm-root/Library/Frameworks
  +       /tmp/rpm-root/Library/Python/ 2>/dev/null
  +    rm -r /tmp/rpm-root/Library/Frameworks 2>/dev/null
       mv /tmp/rpm-root/Library/Python/*/lib/python*/site-packages \
  -       /tmp/rpm-root/Library/Python/*/
  -    rm -r /tmp/rpm-root/Library/Python/*/lib
  +       /tmp/rpm-root/Library/Python/*/ 2>/dev/null
  +    rm -r /tmp/rpm-root/Library/Python/*/lib 2>/dev/null
       mkdir -p /tmp/rpm-root/Library/Python/$python_version/site-packages/rpm
       mv /tmp/rpm-root/usr/local/lib/python*/site-packages/rpm/*.py \
  -       /tmp/rpm-root/Library/Python/*/site-packages/rpm
  -    rm -r /tmp/rpm-root/usr/local/lib/python*
  +       /tmp/rpm-root/Library/Python/*/site-packages/rpm 2>/dev/null
  +    rm -r /tmp/rpm-root/usr/local/lib/python* 2>/dev/null
       mv /tmp/rpm-root/usr/lib/python*/site-packages/rpm/* \
  -       /tmp/rpm-root/Library/Python/*/site-packages/rpm
  -    rm -r /tmp/rpm-root/usr/lib
  -    rm -r /tmp/rpm-root/System
  -    rm -r /tmp/rpm-root/Developer
  +       /tmp/rpm-root/Library/Python/*/site-packages/rpm 2>/dev/null
  +    rm -r /tmp/rpm-root/usr/lib 2>/dev/null
  +    rm -r /tmp/rpm-root/System 2>/dev/null
  +    rm -r /tmp/rpm-root/Developer 2>/dev/null
       chmod 1775 /tmp/rpm-root/Library
       
       # setup default (undetected) configuration, for Mac OS X
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to