Gentoo Archives: gentoo-commits

From: Doug Goldstein <cardoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 29 Mar 2017 14:25:42
Message-Id: 1490797514.dd53899da2ac044f815030e82a6fcf357df1dff9.cardoe@gentoo
1 commit: dd53899da2ac044f815030e82a6fcf357df1dff9
2 Author: Espen Henriksen <dev <AT> henriksen <DOT> is>
3 AuthorDate: Tue Mar 28 17:55:54 2017 +0000
4 Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 29 14:25:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd53899d
7
8 eclass/cargo: Don't fail on missing directory
9
10 Previously the cargo_src_install step fails when using
11 `cargo_src_install || die` and no man-directory is
12 included with the crate. This commit corrects this
13 behavior and ensures it does not die in those cases.
14
15 Package-Manager: Portage-2.3.3
16
17 eclass/cargo.eclass | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
21 index dae18a866bd..32d04a2d559 100644
22 --- a/eclass/cargo.eclass
23 +++ b/eclass/cargo.eclass
24 @@ -125,7 +125,7 @@ cargo_src_install() {
25 || die "cargo install failed"
26 rm -f "${D}/usr/.crates.toml"
27
28 - [ -d "${S}/man" ] && doman "${S}/man"
29 + [ -d "${S}/man" ] && doman "${S}/man" || return 0
30 }
31
32 fi