ssuominen 14/04/08 21:01:41 Modified: udev-9999.ebuild ChangeLog Log: Finetune the 80-net-name-slot.rules migration code a bit and remove unnecessary "then" since net_move=no is already declared above. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.294 sys-fs/udev/udev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.294&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?rev=1.294&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-9999.ebuild?r1=1.293&r2=1.294 Index: udev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- udev-9999.ebuild 3 Apr 2014 19:34:23 -0000 1.293 +++ udev-9999.ebuild 8 Apr 2014 21:01:41 -0000 1.294 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.293 2014/04/03 19:34:23 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.294 2014/04/08 21:01:41 ssuominen Exp $ EAPI=5 @@ -481,9 +481,7 @@ local net_rules_path="${ROOT%/}"/etc/udev/rules.d local net_name_slot="${net_rules_path}"/80-net-name-slot.rules local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ -e ${net_setup_link} ]]; then - net_move=no - else + if [[ ! -e ${net_setup_link} ]]; then [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then net_move=yes 1.1024 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1024&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1024&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1023&r2=1.1024 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1023 retrieving revision 1.1024 diff -u -r1.1023 -r1.1024 --- ChangeLog 5 Apr 2014 20:28:17 -0000 1.1023 +++ ChangeLog 8 Apr 2014 21:01:41 -0000 1.1024 @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1023 2014/04/05 20:28:17 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1024 2014/04/08 21:01:41 ssuominen Exp $ + + 08 Apr 2014; Samuli Suominen <[email protected]> udev-9999.ebuild: + Finetune the 80-net-name-slot.rules migration code a bit and remove + unnecessary "then" since net_move=no is already declared above. 05 Apr 2014; Jeroen Roovers <[email protected]> udev-212-r1.ebuild: Stable for HPPA (bug #505962).
