From: Roy Marples <uberlord@gentoo.org>
Date: Thu, 15 Mar 2007 12:12:26 +0000 (+0000)
Subject: Check files exist before saving/restoring.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be1cfc0e799f0a6d8f6ee1ea5a2b5d4a42ac3eb3;p=gentoo.git

Check files exist before saving/restoring.
Package-Manager: portage-2.1.2.2
---

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index d52e33337227..4865435c9efb 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -26,10 +26,10 @@ AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515
-AUX alsasound.initd 6307 RMD160 26b864db6784bfeb839fb834f3c02d751ff7437b SHA1 67110d5751413cb449cb1b59654ecff58ecaeba0 SHA256 efb2b0564adae0453ea97430321dc05b73e88ae7e014a390bc417beae62268d6
-MD5 6721b6281e809273195d3295727c2708 files/alsasound.initd 6307
-RMD160 26b864db6784bfeb839fb834f3c02d751ff7437b files/alsasound.initd 6307
-SHA256 efb2b0564adae0453ea97430321dc05b73e88ae7e014a390bc417beae62268d6 files/alsasound.initd 6307
+AUX alsasound.initd 6375 RMD160 ba503351f51c6a483a0eb6b0ebd40baf18286850 SHA1 dd18d536546e8ce37109f869ff0ff34ed6cc0c42 SHA256 9123b0c95e13d46e6f4b8bafdf7e8d512c91e37e0bf4d8c1320b1e5a71ab96e7
+MD5 9d249af0a5ccfb5b347676efdac7f17f files/alsasound.initd 6375
+RMD160 ba503351f51c6a483a0eb6b0ebd40baf18286850 files/alsasound.initd 6375
+SHA256 9123b0c95e13d46e6f4b8bafdf7e8d512c91e37e0bf4d8c1320b1e5a71ab96e7 files/alsasound.initd 6375
 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
 DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8
 DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
diff --git a/media-sound/alsa-utils/files/alsasound.initd b/media-sound/alsa-utils/files/alsasound.initd
index 5e6dbfb15e9f..30e4d73f01cf 100644
--- a/media-sound/alsa-utils/files/alsasound.initd
+++ b/media-sound/alsa-utils/files/alsasound.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.3 2007/03/15 11:33:25 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd,v 1.4 2007/03/15 12:12:26 uberlord Exp $
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
@@ -153,6 +153,7 @@ restore() {
 	done
 
 	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+		[ -e "${ossfile}" ] || continue
 		# We use cat because I'm not sure if cp works properly on /proc
 		local procfile=${ossfile##${alsastatedir}/oss}
 		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
@@ -175,6 +176,7 @@ save() {
 	fi
 
 	for ossfile in /proc/asound/card*/pcm*/oss; do
+		[ -e "${ossfile}" ] || continue
 		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
 		device="$(echo "${device}" | sed -e 's,/,_,g')"
 		mkdir -p "${alsastatedir}/oss/"