Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
Date: Wed, 29 Nov 2017 19:30:14
Message-Id: 1511981815.8df1e3c218b317e9e780d081663a8dbee0ac817e.grobian@gentoo
1 commit: 8df1e3c218b317e9e780d081663a8dbee0ac817e
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 29 18:56:55 2017 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 29 18:56:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8df1e3c2
7
8 hashgen: ensure top level Manifest isn't taken for package
9
10 scripts/rsync-generation/hashgen.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 diff --git a/scripts/rsync-generation/hashgen.c b/scripts/rsync-generation/hashgen.c
14 index 4180665e0f..7700e88198 100644
15 --- a/scripts/rsync-generation/hashgen.c
16 +++ b/scripts/rsync-generation/hashgen.c
17 @@ -292,7 +292,7 @@ process_dir(const char *dir)
18 }
19
20 snprintf(manifest, sizeof(manifest), "%s/%s", dir, str_manifest);
21 - if ((f = fopen(manifest, "r")) == NULL) {
22 + if (global_manifest || (f = fopen(manifest, "r")) == NULL) {
23 gzFile mf;
24
25 /* recurse into subdirs */