make sure we clean up our temp files #105827 by Robert Forsman

Package-Manager: portage-2.0.51.22-r2

2 files changed, 52 insertions, 42 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a6b4479608a7..8325453b6bec 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,49 +1,59 @@
-MD5 6f20445818bca7c6522506f3ab70af3b ChangeLog 25858
-MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
-MD5 8853cecf2a4fc6d2306d420947923ad9 udev-062.ebuild 5811
+MD5 601369394beab8a50bd959614a33b261 udev-059.ebuild 5779
+MD5 bd19acabc0ff3c10b792a8ad7e102009 udev-068.ebuild 6646
 MD5 448faa811f8b84803d2caef1c229666a udev-063.ebuild 5811
-MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
-MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
-MD5 d79f919d887e411742660e92adec76fd udev-065.ebuild 5917
-MD5 3fd5842b6468f5fd506f0cbb9811db9d udev-064-r1.ebuild 6011
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 274d69058f9dc59364249e2baf27705b udev-056.ebuild 4380
+MD5 0bd16f42f1bd404a650da235c6eda855 udev-069.ebuild 6648
+MD5 8853cecf2a4fc6d2306d420947923ad9 udev-062.ebuild 5811
+MD5 6debd07c0be5a75e039f4132e1cfba65 udev-068-r1.ebuild 6649
 MD5 6ff199945dba1c1ad03d9cc6335c6d9a udev-066.ebuild 5914
-MD5 bd19acabc0ff3c10b792a8ad7e102009 udev-068.ebuild 6646
 MD5 428e955c009eebb4173dd0e059327e96 udev-067.ebuild 5914
-MD5 274d69058f9dc59364249e2baf27705b udev-056.ebuild 4380
 MD5 1a5f0127787af194bf038bc3f2338a6b udev-058.ebuild 5158
-MD5 601369394beab8a50bd959614a33b261 udev-059.ebuild 5779
+MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
+MD5 d79f919d887e411742660e92adec76fd udev-065.ebuild 5917
+MD5 3fd5842b6468f5fd506f0cbb9811db9d udev-064-r1.ebuild 6011
+MD5 6f20445818bca7c6522506f3ab70af3b ChangeLog 25858
 MD5 9189ff86ab535dfff8bd6718860b40f2 udev-060.ebuild 5779
-MD5 6debd07c0be5a75e039f4132e1cfba65 udev-068-r1.ebuild 6649
-MD5 0bd16f42f1bd404a650da235c6eda855 udev-069.ebuild 6648
-MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
-MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
-MD5 4bc32861744372ee3db7d0141a7f28e6 files/digest-udev-062 61
-MD5 c38ac07766ab6fffea0720beb0e465f6 files/digest-udev-063 61
-MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
-MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
-MD5 0c9207a0cede79a3c37bb7a96a6f2b03 files/digest-udev-065 61
-MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064-r1 61
-MD5 3aad55bdfbf9067a104a325e23dda0f4 files/udev.rules-064-r1 9146
-MD5 53e36b1847ba09f1cbd20ce63b0daa31 files/digest-udev-066 61
+MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
+MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
+MD5 f1a1ae2d8dd0af1e1f5a2df7aa4bc33b files/digest-udev-067 61
+MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
+MD5 e6bf08ab2e77d344f5cd03e30e38ba9a files/udev.conf.post_059 730
 MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068 61
+MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068-r1 61
+MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
+MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
 MD5 ce48708bcbf9e1e3fcfb02c02e412f54 files/digest-udev-056 61
-MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
-MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
-MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
+MD5 4bc32861744372ee3db7d0141a7f28e6 files/digest-udev-062 61
+MD5 53e36b1847ba09f1cbd20ce63b0daa31 files/digest-udev-066 61
+MD5 3aad55bdfbf9067a104a325e23dda0f4 files/udev.rules-064-r1 9146
 MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
-MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
-MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
-MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
-MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
-MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
-MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
 MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
-MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 e6bf08ab2e77d344f5cd03e30e38ba9a files/udev.conf.post_059 730
-MD5 f1a1ae2d8dd0af1e1f5a2df7aa4bc33b files/digest-udev-067 61
+MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
+MD5 0c9207a0cede79a3c37bb7a96a6f2b03 files/digest-udev-065 61
+MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
+MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
 MD5 05abfc4c9a5cad86f814161806c97148 files/digest-udev-069 61
-MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068-r1 61
+MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
+MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
+MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
+MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
+MD5 c38ac07766ab6fffea0720beb0e465f6 files/digest-udev-063 61
+MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
+MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064-r1 61
 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460
-MD5 23d30131860f7df368af4a7a67e066bf files/udev-stop.sh 1949
+MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
+MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
+MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
+MD5 7ea9a8e051fc019e684b7bc09a080e4b files/udev-stop.sh 1980
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJ2F6gIKl8Uu19MoRAlmDAJ9QMKbrRTcU3b7mpkA+VVRjz0jdaQCfUmr5
+K8y4Zmq2shqubaCzS7FcKBw=
+=OexV
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-stop.sh b/sys-fs/udev/files/udev-stop.sh
index aea78be71eb1..8be8e3ced11c 100755
--- a/sys-fs/udev/files/udev-stop.sh
+++ b/sys-fs/udev/files/udev-stop.sh
@@ -3,8 +3,8 @@
 
 main() {
 	if [[ -e /dev/.devfsd || ! -e /dev/.udev || ! -z ${CDBOOT} || \
-			${RC_DEVICE_TARBALL} != "yes" ]] || \
-			! touch /lib/udev-state/devices.tar.bz2 2>/dev/null
+	   ${RC_DEVICE_TARBALL} != "yes" ]] || \
+	   ! touch /lib/udev-state/devices.tar.bz2 2>/dev/null
 	then
 		return 0
 	fi
@@ -16,8 +16,7 @@ main() {
 	devices_totar=$(mktemp /tmp/devices.totar.XXXXXX)
 	device_tarball=$(mktemp /tmp/devices-XXXXXX)
 	
-	if [[ -z ${devices_udev} || -z ${devices_real} || \
-		  -z ${device_tarball} ]]; then
+	if [[ -z ${devices_udev} || -z ${devices_real} || -z ${device_tarball} ]] ; then
 		eend 1 "Could not create temporary files!"
 	else
 		cd /dev
@@ -51,12 +50,13 @@ main() {
 		if [[ -s ${devices_totar} ]]; then
 			try tar --one-file-system -jcpf "${device_tarball}" -T "${devices_totar}"
 			try mv -f "${device_tarball}" /lib/udev-state/devices.tar.bz2
-			try rm -f "${devices_udev}" "${devices_real}"
 		else
 			rm -f /lib/udev-state/devices.tar.bz2
 		fi
 		eend 0
 	fi
+
+	rm -f "${devices_udev}" "${devices_real}" "${devices_totar}" "${device_tarball}"
 }
 
 main