Handle upgrades of .conf files for people #274942 by Peter Volkov.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 40 insertions, 14 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index e1ab9487dd5e..bf110357d9e8 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.156 2010/01/08 02:36:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.157 2010/02/15 02:12:40 vapier Exp $
+
+  15 Feb 2010; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.11.1.ebuild:
+  Handle upgrades of .conf files for people #274942 by Peter Volkov.
 
   08 Jan 2010; Mike Frysinger <vapier@gentoo.org>
   module-init-tools-3.11.1.ebuild:
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index ba327ebc4f2c..fb77cef37efe 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3674 RMD160 28491f1c5a654b21b4d82c2a23b8d0f30ea32960 SHA1 73a8deeb2765a31c0f51042a8ae69e7b3752e8de SHA256 8735f921aadd901b98983ce9678d3e7babb9fd3553ce7881460c050dc5611f66
 AUX module-init-tools-3.2.2-handle-dupliate-aliases.patch 2345 RMD160 12e3132824dadbf853228dec146347cf2b87f31c SHA1 b2b16636ae61de179d4674dbe5c48868aa1e2ca0 SHA256 6cd1ae6736bec9c72474acb6b7dce68db1ec0703f0b55f312dcfefce7cf56166
 AUX module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch 1425 RMD160 ce073d744e0eb191ef10f3a1186f393b42620813 SHA1 5138c1a5b7ead76d683d5d3f31d7c161b0a4dfb2 SHA256 5a058a5dfae5bd6eaf6fa338b800f477b542dd9da0c09283d274504beb19c3b6
@@ -25,18 +22,11 @@ DIST module-init-tools-3.8.tar.bz2 802725 RMD160 147017323c3222844ff91f12398a254
 DIST module-init-tools-3.9.tar.bz2 193216 RMD160 a0bb8bbc385c183e29af64d6de50c940cf631872 SHA1 3f61aea95910a4218db5c0f2436c2906848c2454 SHA256 b21e3094000571ffa567d6bb829cc2e17615a2547f07e91393332e7a210d63dc
 DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634735 SHA1 fa268b48d98e0efab349d45fa7fb2372d58320c1 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
 EBUILD module-init-tools-3.10.ebuild 1394 RMD160 3c4402ec236ce63ff3d39d1aab2745161b7aca9a SHA1 32ff2c0e453f0b9e7a7c20a725b95e9aa7eec79f SHA256 132b0fef82e777526adef25c1a913dc18ea789ab4faad520395cba91ace2609b
-EBUILD module-init-tools-3.11.1.ebuild 1514 RMD160 7f5a5734dd750d6a35fa14010c482644097b1d94 SHA1 a41664d1cfe16f78720199c03c1f46537ca1e976 SHA256 f8e0991745c25c1eec9176475ccd2a9d7810f71e0447dfbf517de72dfec88e96
+EBUILD module-init-tools-3.11.1.ebuild 2628 RMD160 03cfe55d3fa881d85fda81f7b7c84d36312505d7 SHA1 b18a4944c2aa2ce1e52244e3a997a37536ecf243 SHA256 3d4cfb179626afa7e69c9765f9e20e0e9b426952c731e7e3b6339d8bfcb288f4
 EBUILD module-init-tools-3.11.ebuild 1489 RMD160 0e660c8acf3c968891d7c575b7c82a9144ca2480 SHA1 fe77e0070e86dfc0a0828a94089aa836d9bfddfc SHA256 97f0844537ed9d47b9dc40c45e90c78797fd2ec3737c9cea5bbba67ffb1ae3c3
 EBUILD module-init-tools-3.5.ebuild 5214 RMD160 89f345020bbdeec733b8f99e266d10f9bbe83ce5 SHA1 cbbf7d9a5f5ad48f948845e41acdb845d6d2ec8c SHA256 989b11c1ae5264685be5217f1f7af906bb15f65df9a305dd4fd8042ff8d15da0
 EBUILD module-init-tools-3.6-r1.ebuild 5378 RMD160 c036af3995fe86ed1dfd4b3e85877b7b284b6f80 SHA1 3281039a326064f5c9f28042ab7fb64d9f1d1497 SHA256 7498ab69b4867ac731492d8713262a3868c311562ac0244a9a50d5080cadd401
 EBUILD module-init-tools-3.8.ebuild 1558 RMD160 1f55cde679323354ee79e82ec4c77a97ed750a9b SHA1 98ecc8e8e4a67198bbd539737a46491f76e365aa SHA256 5f266282b7d54d38470835595f3cac220358fe2d1a3adecc9a318758a9c66057
 EBUILD module-init-tools-3.9.ebuild 1393 RMD160 b7b225c38c5215f767a147e4480aba1a83b75e1c SHA1 cea446db329db3942898407a6d781d36a8addd6c SHA256 bf4d94404830bd3399b5ec0140d446b72fb9abe27d3dfd22654460e799d6470e
-MISC ChangeLog 27157 RMD160 bbec0f6c4cbb6b494177a7f18476aac5109e5f1f SHA1 13f904b354a12f9dae38a784057eb46eac34553a SHA256 9187157cc4a168749bcd684b10dced5f48ef6c95f8be2a79732ba7e4a0251ceb
+MISC ChangeLog 27312 RMD160 3d61100033bd96a5ec0f68a9aab23a3cf260014d SHA1 628f2b16c7fd6bfd4fb02a5faca16b230240ad56 SHA256 2d6cd036583fa47b52c37875c8711e5d97deca369fd7a08f2b6a6c6257db91d0
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktGmkIACgkQTwhj9JtAlp5d9gEAkbwXUs6QOYe1EPxzFklVWwCY
-n7X4Pap97hkdMPAej3AA/RKHE4KUWimo9UoZb6sprg+qGCYuBcw19KeXY9X9kKob
-=2AqQ
------END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
index 44da73d1bbdc..7bfc958a4de1 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.2 2010/01/08 02:36:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.11.1.ebuild,v 1.3 2010/02/15 02:12:40 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -55,4 +55,36 @@ pkg_postinst() {
 	if grep -qs modules-update "${ROOT}"/etc/init.d/modules ; then
 		sed -i 's:modules-update:update-modules:' "${ROOT}"/etc/init.d/modules
 	fi
+
+	# For files that were upgraded but not renamed via their ebuild to
+	# have a proper .conf extension, rename them so etc-update tools can
+	# take care of things. #274942
+	local i f cfg
+	eshopts_push -s nullglob
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		# The .conf files need no upgrading unless a non-.conf exists,
+		# so skip this until later ...
+		[[ ${f} == *.conf ]] && continue
+		# If a .conf doesn't exist, then a package needs updating, or
+		# the user created it, or it's orphaned.  Either way, we don't
+		# really know, so leave it alone.
+		[[ ! -f ${f}.conf ]] && continue
+
+		i=0
+		while :; do
+			cfg=$(printf "%s/._cfg%04d_%s.conf" "${f%/*}" ${i} "${f##*/}")
+			[[ ! -e ${cfg} ]] && break
+			((i++))
+		done
+		einfo "Updating ${f}; please run 'etc-update'"
+		mv "${f}.conf" "${cfg}"
+		mv "${f}" "${f}.conf"
+	done
+	# Whine about any non-.conf files that are left
+	for f in "${ROOT}"etc/modprobe.d/* ; do
+		[[ ${f} == *.conf ]] && continue
+		ewarn "The '${f}' file needs to be upgraded to end with a '.conf'."
+		ewarn "Either upgrade the package that owns it, or manually rename it."
+	done
+	eshopts_pop
 }