From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE741138330 for ; Mon, 12 Sep 2016 17:59:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08697E08BA; Mon, 12 Sep 2016 17:59:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE61DE08BA for ; Mon, 12 Sep 2016 17:59:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1F4D3408F0 for ; Mon, 12 Sep 2016 17:59:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7DEE2464 for ; Mon, 12 Sep 2016 17:59:27 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1473703111.ac53c9a658589456c678b6bfe674a66a3845e564.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/init.sh.BSD.in sh/init.sh.GNU-kFreeBSD.in sh/init.sh.GNU.in sh/init.sh.Linux.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ac53c9a658589456c678b6bfe674a66a3845e564 X-VCS-Branch: master Date: Mon, 12 Sep 2016 17:59:27 +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: 5b1f9740-1e76-4ded-b898-5841fb652e60 X-Archives-Hash: 8e0c1c7017dc0b06ea1db0e4b8649f1c commit: ac53c9a658589456c678b6bfe674a66a3845e564 Author: William Hubbs gmail com> AuthorDate: Mon Sep 12 16:20:26 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Sep 12 17:58:31 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ac53c9a6 sh/init.sh: fix the test for cache restoration This fixes the test for cache restoration since we are no longer caching the dependency tree. sh/init.sh.BSD.in | 2 +- sh/init.sh.GNU-kFreeBSD.in | 2 +- sh/init.sh.GNU.in | 2 +- sh/init.sh.Linux.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sh/init.sh.BSD.in b/sh/init.sh.BSD.in index 6fe0bde..64282e9 100644 --- a/sh/init.sh.BSD.in +++ b/sh/init.sh.BSD.in @@ -57,7 +57,7 @@ case "$(openrc --sys)" in esac retval=$? -if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then +if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null fi diff --git a/sh/init.sh.GNU-kFreeBSD.in b/sh/init.sh.GNU-kFreeBSD.in index db3eec3..5eb8064 100644 --- a/sh/init.sh.GNU-kFreeBSD.in +++ b/sh/init.sh.GNU-kFreeBSD.in @@ -34,7 +34,7 @@ ebegin "Creating $RC_SVCDIR" mkdir -p $RC_SVCDIR eend $? -if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then +if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null fi diff --git a/sh/init.sh.GNU.in b/sh/init.sh.GNU.in index f08bac7..08a492a 100644 --- a/sh/init.sh.GNU.in +++ b/sh/init.sh.GNU.in @@ -36,7 +36,7 @@ ebegin "Creating $RC_SVCDIR" mkdir -p $RC_SVCDIR eend $? -if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then +if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null fi diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in index 7d36e7a..344f627 100644 --- a/sh/init.sh.Linux.in +++ b/sh/init.sh.Linux.in @@ -85,7 +85,7 @@ if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then eend $? fi -if [ -e "$RC_LIBEXECDIR"/cache/deptree ]; then +if [ -e "$RC_LIBEXECDIR"/cache/softlevel ]; then cp -p "$RC_LIBEXECDIR"/cache/* "$RC_SVCDIR" 2>/dev/null fi