Only reload the hwdb.bin when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 32 insertions, 21 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e3db0dde9d4a..73e03771bf3e 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.955 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.956 2013/08/12 13:50:35 ssuominen Exp $
+
+  12 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
+  udev-9999.ebuild:
+  Only reload the hwdb.bin when we are not upgrading to avoid potential race w/
+  incompatible hwdb.bin and the running udevd.
 
   11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> udev-206-r3.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index b4665c384cd9..a32ccb46604e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -6,9 +6,9 @@ DIST systemd-206.tar.xz 2340536 SHA256 4c993de071118ea1df7ffc4be26ef0b0d78354ef1
 DIST udev-204-patches-2.tar.xz 1824 SHA256 d693c79b93865dd4f3092f5f9e69221a494d286f15dcc5418de1e09120289404 SHA512 e5004a8bdaca6ead9bd5f345ff86c94b05579cb3aaa032782dc13e1a1d574ef65e294c01b44143f78517db6f64fb630470c082f43b6989134a8e68f48d444e6a WHIRLPOOL ba21f3d8f4964da79476102eb82c1b5ffd7e91b5d60be705cb9784fc2150dba3faf4afe7718e2f9dfc5cc7e79644bf21b8312fec328a733e056eb60dc0269222
 DIST udev-206-patches-2.tar.xz 1840 SHA256 02643ba4a3c4c5312a2f4c22e06925509d923955046de260468d696d1b9a5672 SHA512 cd316356d1b23ed3c3047d7129cda6ed26bb0334c4becc802b727edf40e026fb5ae228075eb7143b3071887ce1dd493326d6b071058c5f862372b616cc731fc1 WHIRLPOOL 0685afcd08ace9f67d143b275dc724d540a2c2204b6f52cf60ad2195f5dbd665b20775ed40f70816d9ccdb2bf354f60e026ef4e781cf9dcccd93ff29121a6cb1
 EBUILD udev-204.ebuild 13475 SHA256 5604664100abcd19d5e849e4b2ea4501706b38fa8da18389a6f147c419593661 SHA512 dc53345e87d722594a3182b2dc991938f03d89d8ab703134334a36f53340dba2112536153cd9c5ffc56ba7d57dc0e11e0afaab40c97d48700186cf5748ef635a WHIRLPOOL 0e50da3273399f8d8e5b6ddab71eca233d0993dcfa7928c90aba2644c96340a1045bfa8208f4006965c1dc466316eb90a946bd4157e71eaadc6c032180771d25
-EBUILD udev-206-r3.ebuild 15362 SHA256 7163900a25a2dc1c6b7aaea4e1287f2f865c6d2ae61af57b36259f3dac1c4e54 SHA512 761e2654017e0f1aa10621206a8ba4dba8cd7c94876f83f160a333028870037455d7351280bbe20961c43cff9bf0de994f1121857179ca0b0af7bc85281c759c WHIRLPOOL a5897a34721a25fac9e9baf4672eb8336745c40f210517031412ec78b17d4a64cc3fa8b6fc988cdfd0fbd330c92b5ba2724702118afc837b522226e177dc6fec
-EBUILD udev-9999.ebuild 15361 SHA256 a383cbb8a3b19f19f6a65c1ac13fa5eb436d83cc654b441053135f11ca19cc2a SHA512 77d06805ea61636a33be72752def789c8eb9c542ba1d1763d9b97583aa8c7c4a174cd20fb9781e93a398b23ce202da03b2ad60b16a00d47cc9490132ad1ebf62 WHIRLPOOL aaba965f8e6002c021d4b69bbdfde9b6b16d18e9f47008002dfeb8a16a9456de66548428171776ea018929fddc76afc72544a3d65d3fc55141db633e4d4e32ee
-MISC ChangeLog 33803 SHA256 1afba4c02724793973638e469300930ef136489f028b79c7437c702c8ee8c2f5 SHA512 9dd6a328d2e064ab432010ab33eff8bfa4068016706a2fc06de50a5c71e600b2d348f8cbb029b7b9b8671a0bb2deddeeac3b2c2440a99c4912a609f25b435691 WHIRLPOOL 34a66cef0a05986e67f0139cc5973ed53b8f015d069cf0a08c13e676ee7f39533de839c4f9384ec5d3d0d9eec3f154bcb781cf7cf647564a84bf87754fba53bd
+EBUILD udev-206-r3.ebuild 15527 SHA256 78e1d1e45e441e8717bb612e405576ce2539d304f72767412496af9f2356803a SHA512 95bc247dc1ddc07ab1e96c51b51ee3907f8dce2bc9b555db70f197ecabc51f71fc9e8404abee8c0662424480f4b59bd8af16db5fe4812e6633e2874919a80975 WHIRLPOOL cbde0e32943e06f41e69fcf6c12dfbf5f0f42f157d70e00c280b7a9364973c331305409adaeb306164fb572691ace7e7f70b291b3d431e5606edab925b593457
+EBUILD udev-9999.ebuild 15526 SHA256 2574ae6ffd09ad17932ca4b94608bce8c46a0dc6d62409fd5be10e01011df1e4 SHA512 fc13a655bd98dbcf5c9efef1875f0350f6ff60f4d5728a3d022c19e132abde781cd2989bfa5c5d77f5b8ae3f99f98d80da416f9db1f7304236f76a0cdb084f38 WHIRLPOOL efc08361b894f0603c60d9803c61f4b7e6dcaee17c4e48470383c9b676fae9cb21f89c7429fbf73558321fdf86325b7b2c04dfe9105a2551dcc22e4529371be3
+MISC ChangeLog 34025 SHA256 f70db914301a58e32840ecd84a627d728419c026ff767932d1b6489033f13c9e SHA512 c26e14b7e57120cdc6b477dc2bd53cced2d550f70288c9ffd8f78bf3cdd032af705b9cd513ec7838518dc6e2f6eb95ac1eea088881ce6c7073f21a049a0e6b6e WHIRLPOOL 74102147bf1001fb4110fedf7e5f674b4fc5c5e7316ae944b425cf39f7480a35b16ddca3bb9ab01f9daafc86a6612237250a234518a2e03c83b92f313e102148
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -17,11 +17,11 @@ MISC metadata.xml 804 SHA256 2489d91db9d09f0d411b17dff6c8a595fb48ca65e8b6abcbdf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSB979AAoJEEdUh39IaPFNFJsH/394rNSC4rH9CF67bGVLC94B
-oDKm8MOPhmG253CrJAZnHuA6Iv8QwAL1ktxiZX4OTVHUoKXBOBOp7i0SWYn8Za2o
-vXp4ek0eAtSM9nlpE0YnE3VTKKWwtFMRItykmh64BgH65DBMJmRtzPteXEUJJfEx
-uzo5BMkovxTdQCauZ7VuMMtR5Oec9r3sDr9tfbaoPjTN6gboMnPCz8hZOrImBxqA
-qEMfAL8bBnh7NJ64j5odWDoBrMkQRP6RkAA7K/YbXIarB5/FJv3N03gjN0BQU3OV
-Q54s0R9ENbkyIBZkw1uS5LUn5qjk86a6pAnYYgKBIAUUEPaxINAgx4fiMQuvmcE=
-=dbg+
+iQEcBAEBCAAGBQJSCOejAAoJEEdUh39IaPFNgZ4H/AuLnVanDAhgyfLLhUGVtlEZ
+tjxCYcNJ964Kaifk6EBelF8AqCJ0tbfJan1DUt4/ssU1b7kHc48FUJEFnFYEBi7t
+IjhCZh+2sln4yQ+zFw4ihvbuJxn+MN77Dop5VkmYNSBL8UZmd7oHf5okbj7aZDaS
+rcsmRjGH/c9mDrskIHDV5qtdbdLqEg9NTt6jr4xGWxaVHvgyqt7hHkVEKfYVRkpe
+jb6cUkL4j5VPhyk6iDqXMhQGtoWH5wcPsABwweEnbf9uylWcerOGDy53fgr5Pgdn
+k7/xNmWNzoIEpGfrg7oqXo4149s9j2wDm+Er0HBdWRvc3+IkZU7elsxdZWnoLY0=
+=eXNY
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-206-r3.ebuild b/sys-fs/udev/udev-206-r3.ebuild
index e59760ea4342..6ac4ba70d98d 100644
--- a/sys-fs/udev/udev-206-r3.ebuild
+++ b/sys-fs/udev/udev-206-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.4 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-206-r3.ebuild,v 1.5 2013/08/12 13:50:35 ssuominen Exp $
 
 EAPI=5
 
@@ -513,10 +513,13 @@ pkg_postinst() {
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-			return 0
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+				return 0
+			fi
+			udevadm control --reload
 		fi
-		udevadm control --reload
 	fi
 }
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 4b84896640c0..c3ae8042775a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.250 2013/08/11 19:01:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.251 2013/08/12 13:50:35 ssuominen Exp $
 
 EAPI=5
 
@@ -513,10 +513,13 @@ pkg_postinst() {
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
 		udevadm hwdb --update --root="${ROOT%/}"
-		# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-			return 0
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+			if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
+				return 0
+			fi
+			udevadm control --reload
 		fi
-		udevadm control --reload
 	fi
 }