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 748D3139082 for ; Wed, 29 Nov 2017 19:30:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEB69E0AC9; Wed, 29 Nov 2017 19:30:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A6E6E0AC9 for ; Wed, 29 Nov 2017 19:30:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03F7233D4A6 for ; Wed, 29 Nov 2017 19:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95310ABEC for ; Wed, 29 Nov 2017 19:30:04 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1511981815.8df1e3c218b317e9e780d081663a8dbee0ac817e.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/rsync-generation/hashgen.c X-VCS-Directories: scripts/rsync-generation/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 8df1e3c218b317e9e780d081663a8dbee0ac817e X-VCS-Branch: master Date: Wed, 29 Nov 2017 19:30:04 +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: f8999774-fedb-4ae5-8824-9c232099a857 X-Archives-Hash: f624c981c79d5969070b3aff71ada4a3 commit: 8df1e3c218b317e9e780d081663a8dbee0ac817e Author: Fabian Groffen gentoo org> AuthorDate: Wed Nov 29 18:56:55 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Nov 29 18:56:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8df1e3c2 hashgen: ensure top level Manifest isn't taken for package scripts/rsync-generation/hashgen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rsync-generation/hashgen.c b/scripts/rsync-generation/hashgen.c index 4180665e0f..7700e88198 100644 --- a/scripts/rsync-generation/hashgen.c +++ b/scripts/rsync-generation/hashgen.c @@ -292,7 +292,7 @@ process_dir(const char *dir) } snprintf(manifest, sizeof(manifest), "%s/%s", dir, str_manifest); - if ((f = fopen(manifest, "r")) == NULL) { + if (global_manifest || (f = fopen(manifest, "r")) == NULL) { gzFile mf; /* recurse into subdirs */