Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd: dhcpcd-5.6.2.ebuild
Date: Fri, 02 Nov 2012 13:58:17
Message-Id: 20121102135800.9758621505@flycatcher.gentoo.org
1 williamh 12/11/02 13:58:00
2
3 Modified: dhcpcd-5.6.2.ebuild
4 Log:
5 Only display messages about zeroconf if the status of the use flag changed for bug #440410.
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
8
9 Revision Changes Path
10 1.6 net-misc/dhcpcd/dhcpcd-5.6.2.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?r1=1.5&r2=1.6
15
16 Index: dhcpcd-5.6.2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- dhcpcd-5.6.2.ebuild 29 Oct 2012 20:55:54 -0000 1.5
23 +++ dhcpcd-5.6.2.ebuild 2 Nov 2012 13:58:00 -0000 1.6
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v 1.5 2012/10/29 20:55:54 jdhore Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v 1.6 2012/11/02 13:58:00 williamh Exp $
29
30 EAPI=4
31
32 @@ -53,6 +53,10 @@
33 systemd_dounit "${FILESDIR}"/${PN}.service
34 }
35
36 +pkg_preinst() {
37 + has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
38 +}
39 +
40 pkg_postinst() {
41 # Upgrade the duid file to the new format if needed
42 local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
43 @@ -66,7 +70,7 @@
44 cp -p "${old_duid}" "${new_duid}"
45 fi
46
47 - if use zeroconf; then
48 + if use zeroconf && ! $prev_zero; then
49 elog "You have installed dhcpcd with zeroconf support."
50 elog "This means that it will always obtain an IP address even if no"
51 elog "DHCP server can be contacted, which will break any existing"