Add some more error checking into the unpacking stage.

Package-Manager: portage-2.1.1_rc1-r1

3 files changed, 23 insertions, 20 deletions

diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 43b9cd529522..9fff9c25042a 100644
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/nwn-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.16 2006/08/29 21:49:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.17 2006/09/01 23:57:42 wolf31o2 Exp $
+
+  01 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Add some more error checking into the unpacking stage.
 
   29 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
   Stable for games-rpg/nwn-1.6.7-r1+
diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 190f69862ad3..f14311d42175 100644
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -8,14 +8,14 @@ DIST nwitalian129.tar.gz 3926804
 DIST nwn.png 4296 RMD160 958ed2051e91b0ab5f7ae8892c8ed3012cfe3900 SHA1 a4de1822df20ffaa18ff14060d00ea75eee56939 SHA256 9703cb47b32d6bf0202198ab490395046d2ef4ffdde22dca91748a966134e139
 DIST nwresources129.tar.gz 1212356127 RMD160 1a986d12bc3153ff7646053e60d610155944b5ac SHA1 6f399dbf876f357a57096996447d4b9fa68bcb58 SHA256 40e7bb8aebae931c2ce05f199ed15714845b403c4a6d9fab88092e784214bee2
 DIST nwspanish129.tar.gz 3912516
-EBUILD nwn-data-1.29.ebuild 6622 RMD160 3a329685c4c929d60e54879ad68217269bb0bed6 SHA1 df509cddffa573d0c01ad8aa0ca21a090161fcfa SHA256 c35b98457c1ea9e114cf3ce3f7c3347f7bd1041dd764f4aecaad754d42c33649
-MD5 7d795048dd7f83c6e152bbddf99254b3 nwn-data-1.29.ebuild 6622
-RMD160 3a329685c4c929d60e54879ad68217269bb0bed6 nwn-data-1.29.ebuild 6622
-SHA256 c35b98457c1ea9e114cf3ce3f7c3347f7bd1041dd764f4aecaad754d42c33649 nwn-data-1.29.ebuild 6622
-MISC ChangeLog 2639 RMD160 8d01ffdacb8d2e9c68c3fc2b545c17c7862aecde SHA1 0d1112d8789a838a4f2791796062a9f8fa116b56 SHA256 5ecc5039705d5365b5dbe5f011652c20b85aa02faf9cd14bcc63396afa2bd43e
-MD5 969c0bc3ca9cb0cd3923ccbd130e99e6 ChangeLog 2639
-RMD160 8d01ffdacb8d2e9c68c3fc2b545c17c7862aecde ChangeLog 2639
-SHA256 5ecc5039705d5365b5dbe5f011652c20b85aa02faf9cd14bcc63396afa2bd43e ChangeLog 2639
+EBUILD nwn-data-1.29.ebuild 6755 RMD160 e9d6db11844efb77722ad915f0649b176f0c9082 SHA1 6dc79deaae1fc3d0529872fbee94026150de4d4b SHA256 1b15c2a6f6abb71a955da09b32c280ce139239a142464eabada002cdbbb282d4
+MD5 fcd30fe76967265eaff51a94bc043629 nwn-data-1.29.ebuild 6755
+RMD160 e9d6db11844efb77722ad915f0649b176f0c9082 nwn-data-1.29.ebuild 6755
+SHA256 1b15c2a6f6abb71a955da09b32c280ce139239a142464eabada002cdbbb282d4 nwn-data-1.29.ebuild 6755
+MISC ChangeLog 2773 RMD160 97abb475bb8075fcb126eb9b6b6c6809c58f317d SHA1 d67c217cd8b1947d4d3cbc5cd8b4b4e59630133b SHA256 535f5932e29b3f7968984b0b2cf2bbdfcc0e19d5976689ee9d1fc75bc2c8ab15
+MD5 71f47b63d98c00aef5486a385f3e5ce7 ChangeLog 2773
+RMD160 97abb475bb8075fcb126eb9b6b6c6809c58f317d ChangeLog 2773
+SHA256 535f5932e29b3f7968984b0b2cf2bbdfcc0e19d5976689ee9d1fc75bc2c8ab15 ChangeLog 2773
 MISC metadata.xml 254 RMD160 877a1dc36df2be58926bc51041093feafdefe429 SHA1 45f0334cd127c4a1b4ece41f7098ab70046e378a SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
@@ -26,7 +26,7 @@ SHA256 b20b913dad2a788b10c54d2ac9c4589f6ce45088e04abda93fab1ecfa8e976de files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE9LaVkT4lNIS36YERArZ+AJoCso97nb7C8Ya/Vp/vkxGhb6tYWQCePVRo
-DQeG4hz9f5T1iC6WDBr03ZY=
-=REFI
+iD8DBQFE+Ml1kT4lNIS36YERAkmkAKCi7XTyTgcxgt/5WJd8zax28lF7hACfZ5dF
+xvDVJP8AwVU91es7qofPdYY=
+=9mIw
 -----END PGP SIGNATURE-----
diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index 5d6bdbece7cd..f039f7a4a5d1 100644
--- a/games-rpg/nwn-data/nwn-data-1.29.ebuild
+++ b/games-rpg/nwn-data/nwn-data-1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.17 2006/08/29 21:49:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.18 2006/09/01 23:57:42 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -102,10 +102,10 @@ src_unpack() {
 	fi
 	if use sou
 	then
-		unzip -o "${CDROM_ROOT}"/Data_Shared.zip
-		unzip -o "${CDROM_ROOT}"/Language_data.zip
-		unzip -o "${CDROM_ROOT}"/Language_update.zip
-		unzip -o "${CDROM_ROOT}"/Data_Linux.zip
+		unzip -o "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking"
+		unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking"
+		unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
+		unzip -o "${CDROM_ROOT}"/Data_Linux.zip || die "unpacking"
 		rm -f data/patch.bif patch.key
 		touch .metadata/sou || die "touching sou"
 	fi
@@ -117,9 +117,9 @@ src_unpack() {
 			cdrom_load_next_cd
 		fi
 		rm -f data/patch.bif patch.key
-		unzip -o "${CDROM_ROOT}"/Data_Shared.zip
-		unzip -o "${CDROM_ROOT}"/Language_data.zip
-		unzip -o "${CDROM_ROOT}"/Language_update.zip
+		unzip -o "${CDROM_ROOT}"/Data_Shared.zip || die "unpacking"
+		unzip -o "${CDROM_ROOT}"/Language_data.zip || die "unpacking"
+		unzip -o "${CDROM_ROOT}"/Language_update.zip || die "unpacking"
 		touch .metadata/hou || die "touching hou"
 	fi