From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0F88C1391DB for ; Mon, 17 Mar 2014 03:46:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 974A6E09BE; Mon, 17 Mar 2014 03:46:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B0BCE09BE for ; Mon, 17 Mar 2014 03:46:55 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6475333FB62 for ; Mon, 17 Mar 2014 03:46:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0897318875 for ; Mon, 17 Mar 2014 03:46:53 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1395027988.c42cf6d80aa2e5f9faef11913134c15af20d0664.floppym@gentoo> Subject: [gentoo-commits] proj/python-updater:master commit in: / X-VCS-Repository: proj/python-updater X-VCS-Files: python-updater.in X-VCS-Directories: / X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c42cf6d80aa2e5f9faef11913134c15af20d0664 X-VCS-Branch: master Date: Mon, 17 Mar 2014 03:46:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a853b375-d3af-49e1-b480-62701728ebbb X-Archives-Hash: d31ab5b6153dcfa070238c22fc2a080d commit: c42cf6d80aa2e5f9faef11913134c15af20d0664 Author: Mike Gilbert gentoo org> AuthorDate: Mon Mar 17 03:46:28 2014 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Mar 17 03:46:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/python-updater.git;a=commit;h=c42cf6d8 Source /etc/init.d/functions.sh as a fallback. --- python-updater.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-updater.in b/python-updater.in index f079316..2e5de5b 100644 --- a/python-updater.in +++ b/python-updater.in @@ -62,7 +62,14 @@ CHECK_SHARED_LINKING="1" CHECK_STATIC_LINKING="1" # Load the Gentoo-style info macros -. "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh +if [[ -e "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then + . "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh +elif [[ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then + . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh +else + echo "Unable to find functions.sh" + exit 1 +fi # Portage variables. PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"