[gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd: dhcpcd-5.6.2.ebuild

[gentoo-commits] gentoo-x86 commit in net-misc/dhcpcd: dhcpcd-5.6.2.ebuild

[William Hubbs (williamh)]

williamh    12/11/02 13:58:00

  Modified:             dhcpcd-5.6.2.ebuild
  Log:
  Only display messages about zeroconf if the status of the use flag changed for bug #440410.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.6                  net-misc/dhcpcd/dhcpcd-5.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild?r1=1.5&r2=1.6

Index: dhcpcd-5.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dhcpcd-5.6.2.ebuild	29 Oct 2012 20:55:54 -0000	1.5
+++ dhcpcd-5.6.2.ebuild	2 Nov 2012 13:58:00 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v 1.5 2012/10/29 20:55:54 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.6.2.ebuild,v 1.6 2012/11/02 13:58:00 williamh Exp $
 
 EAPI=4
 
@@ -53,6 +53,10 @@
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
+pkg_preinst() {
+	has_version 'net-misc/dhcpcd[zeroconf]' && prev_zero=true || prev_zero=false
+}
+
 pkg_postinst() {
 	# Upgrade the duid file to the new format if needed
 	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
@@ -66,7 +70,7 @@
 		cp -p "${old_duid}" "${new_duid}"
 	fi
 
-	if use zeroconf; then
+	if use zeroconf && ! $prev_zero; then
 		elog "You have installed dhcpcd with zeroconf support."
 		elog "This means that it will always obtain an IP address even if no"
 		elog "DHCP server can be contacted, which will break any existing"