pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python Check for directory existence inside an "i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/05ccfecaa79d
branches:  trunk
changeset: 347862:05ccfecaa79d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 01 09:44:52 2016 +0000

description:
Check for directory existence inside an "if", so that non-existence
does not cause breakage.

Fixes build of e.g. syncthing-gtk.

>From richard@

diffstat:

 lang/python/egg.mk |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 4161df68a900 -r 05ccfecaa79d lang/python/egg.mk
--- a/lang/python/egg.mk        Wed Jun 01 09:05:25 2016 +0000
+++ b/lang/python/egg.mk        Wed Jun 01 09:44:52 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.22 2016/05/28 11:23:46 richard Exp $
+# $NetBSD: egg.mk,v 1.23 2016/06/01 09:44:52 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -42,8 +42,9 @@
 privileged-install-hook:       fixup-egg-info
 .PHONY:                                fixup-egg-info
 fixup-egg-info:        # ensure egg-info directory contents are always 644
-       ${TEST} -d "${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}" && \
+       if ${TEST} -d "${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}"; then \
            ${FIND} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR} -type f \
-               -exec ${CHMOD} ${SHAREMODE} '{}' +
+               -exec ${CHMOD} ${SHAREMODE} '{}' +; \
+       fi
 
 .include "../../lang/python/extension.mk"



Home | Main Index | Thread Index | Old Index