/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.359 Revision 1.360
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.360 2011/08/07 23:35:28 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
380 _epatch_draw_line "***** ${patchname} *****" 380 _epatch_draw_line "***** ${patchname} *****"
381 echo 381 echo
382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" 382 echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'"
383 echo 383 echo
384 _epatch_draw_line "***** ${patchname} *****" 384 _epatch_draw_line "***** ${patchname} *****"
385 patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1
386 ret=$?
387 echo
388 echo "patch program exited with status ${ret}"
389 exit ${ret}
385 ) >> "${STDERR_TARGET}" 390 ) >> "${STDERR_TARGET}"
386 391
387 if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then 392 if [ $? -eq 0 ] ; then
388 ( 393 (
389 _epatch_draw_line "***** ${patchname} *****" 394 _epatch_draw_line "***** ${patchname} *****"
390 echo 395 echo
391 echo "ACTUALLY APPLYING ${patchname} ..." 396 echo "ACTUALLY APPLYING ${patchname} ..."
392 echo 397 echo
393 _epatch_draw_line "***** ${patchname} *****" 398 _epatch_draw_line "***** ${patchname} *****"
394 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1 399 patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1
400 ret=$?
401 echo
402 echo "patch program exited with status ${ret}"
403 exit ${ret}
395 ) >> "${STDERR_TARGET}" 404 ) >> "${STDERR_TARGET}"
396 405
397 if [ $? -ne 0 ] ; then 406 if [ $? -ne 0 ] ; then
398 echo 407 echo
399 eerror "A dry-run of patch command succeeded, but actually" 408 eerror "A dry-run of patch command succeeded, but actually"

Legend:
Removed from v.1.359  
changed lines
  Added in v.1.360

  ViewVC Help
Powered by ViewVC 1.1.20