Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] [PATCH 1/5] gnome2-utils.eclass: phase out emktemp
Date: Thu, 09 Dec 2021 15:04:31
Message-Id: 1f731fd5d6309bf1ebeb8e08b73ca903a1bc47dc.camel@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/5] gnome2-utils.eclass: phase out emktemp by Marek Szuba
1 On Thu, 2021-12-09 at 13:23 +0000, Marek Szuba wrote:
2 > Has been deprecated for quite a while now, comes from eutils.eclass
3 > so it blocks EAPI 8+. Just call mktemp directly.
4 >
5 > Signed-off-by: Marek Szuba <marecki@g.o>
6 > ---
7 > eclass/gnome2-utils.eclass | 7 +++----
8 > 1 file changed, 3 insertions(+), 4 deletions(-)
9 >
10 > diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
11 > index f7d45090f82..39c4797eedf 100644
12 > --- a/eclass/gnome2-utils.eclass
13 > +++ b/eclass/gnome2-utils.eclass
14 > @@ -1,4 +1,4 @@
15 > -# Copyright 1999-2020 Gentoo Authors
16 > +# Copyright 1999-2021 Gentoo Authors
17 > # Distributed under the terms of the GNU General Public License v2
18 >
19 > # @ECLASS: gnome2-utils.eclass
20 > @@ -16,10 +16,9 @@
21 > # * scrollkeeper (old Gnome help system) management
22 >
23 > [[ ${EAPI} == 5 ]] && inherit multilib
24 > -# eutils.eclass: emktemp
25 > # toolchain-funs.eclass: tc-is-cross-compiler
26 > # xdg-utils.eclass: xdg_environment_reset, xdg_icon_cache_update
27 > -inherit eutils toolchain-funcs xdg-utils
28 > +inherit toolchain-funcs xdg-utils
29 >
30 > case ${EAPI} in
31 > 5|6|7) ;;
32 > @@ -379,7 +378,7 @@ gnome2_gdk_pixbuf_update() {
33 > fi
34 >
35 > ebegin "Updating gdk-pixbuf loader cache"
36 > - local tmp_file=$(emktemp)
37 > + local tmp_file=$(mktemp "${T}"/tmp.XXXXXXXXXX) || die "Failed to create temporary file"
38
39 Why do you need to use random name in the first place? We have full
40 control over T, so why not just hardcode a good name?
41
42 > ${updater} 1> "${tmp_file}" &&
43 > chmod 0644 "${tmp_file}" &&
44 > cp -f "${tmp_file}" "${EROOT%/}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
45
46 --
47 Best regards,
48 Michał Górny

Replies