Fixing a bug within the init-script, using 'exit 1' isn't allowed (thanks to Magnus...

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index 4801f25120531d852d4dc2e10f0eb7fa932360dc..587b9184a4ebe55fca3cacce1fc6764f030264f4 100644 (file)
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw3945d
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.10 2006/12/18 00:33:31 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.11 2006/12/22 10:11:26 phreak Exp $
+
+  22 Dec 2006; Christian Heim <phreak@gentoo.org> files/ipw3945d-init.d:
+  Fixing a bug within the init-script, using 'exit 1' isn't allowed (thanks to
+  Magnus Ahlberg in #158814).
 
   18 Dec 2006; Christian Heim <phreak@gentoo.org> ipw3945d-1.7.22-r4.ebuild:
   Adding a postinst hack, to change the permission/ownership in case the

diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest
index 536bdfd01e3793dc20a1ddae5d921d4e5f4e95b4..468750893af5366b4bdd1dae929af1334eaf65b3 100644 (file)
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -13,10 +13,10 @@ AUX ipw3945d-conf.d 174 RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b SHA1 d4a
 MD5 97d349b235ca84011032f501cfd65a92 files/ipw3945d-conf.d 174
 RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b files/ipw3945d-conf.d 174
 SHA256 d7c4588328f22779016823724b3157f603f9747c9b4d77a1f15e83cabd1a7091 files/ipw3945d-conf.d 174
-AUX ipw3945d-init.d 913 RMD160 adabd1db370f37d2979af98fbe149af32e344da8 SHA1 34b96d31adedb63f7aa8523060e9d880f1ac2a4f SHA256 9c38e8650fc395b4cde962e0b5c849d71feab367bb4ef4ce24f2d711bf1b6977
-MD5 ff790c2cee9de5726838e0fcc68bd1d3 files/ipw3945d-init.d 913
-RMD160 adabd1db370f37d2979af98fbe149af32e344da8 files/ipw3945d-init.d 913
-SHA256 9c38e8650fc395b4cde962e0b5c849d71feab367bb4ef4ce24f2d711bf1b6977 files/ipw3945d-init.d 913
+AUX ipw3945d-init.d 915 RMD160 d3d0d59355fae30e0433c7fc303ab4558523d994 SHA1 1cb9c3294f3da6c56b2c4e40e7798e37c47aa03d SHA256 437f808219929eafffb194a2c9ce0c1c46aac772dec787b250e1b1fb9fca54b7
+MD5 7d40858366a0157e5b25a09be8d0a73e files/ipw3945d-init.d 915
+RMD160 d3d0d59355fae30e0433c7fc303ab4558523d994 files/ipw3945d-init.d 915
+SHA256 437f808219929eafffb194a2c9ce0c1c46aac772dec787b250e1b1fb9fca54b7 files/ipw3945d-init.d 915
 DIST ipw3945d-1.7.18.tgz 57929 RMD160 3d4d4830c78b4124631d5d4cc9e91417630df810 SHA1 838418cffa6706a214d16e43ab3595e193fbbe6a SHA256 aa43ee86df58350a7c864ecba59d7c5e888058311fb782e325e783901955b83d
 DIST ipw3945d-1.7.22.tgz 59936 RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 SHA1 6e97908ea12e41bc97a2b715e9dc887e894df9a6 SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397
 EBUILD ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da61 SHA1 e8a830525df410088877c26632093f0676f49df5 SHA256 4bfc0eed9604fcbe7c9488fbadb16c57df582747e86aab135995c9b05712e6cf
@@ -31,10 +31,10 @@ EBUILD ipw3945d-1.7.22-r4.ebuild 2118 RMD160 1da79287dd21e9cb1ffae7635d0b8859e7b
 MD5 9d95ea6e82e6f017eaf0af46545b7995 ipw3945d-1.7.22-r4.ebuild 2118
 RMD160 1da79287dd21e9cb1ffae7635d0b8859e7bef680 ipw3945d-1.7.22-r4.ebuild 2118
 SHA256 c46bd1a3ae20346619e6a98fcab64babf89c2f8301bc7f16be19614cbd7f0434 ipw3945d-1.7.22-r4.ebuild 2118
-MISC ChangeLog 2565 RMD160 78aeb646ec0900459eec2ce69c7f89c95e10e2f7 SHA1 bd919b5354f11e5367c7e833443b2b2d5a1b393c SHA256 75473d3e4a70007cb88e77d34dd8ea88ea2c0a4b0e15e7385df302ecf5ff31f5
-MD5 883af7f586c2d865c1b75591e98a080f ChangeLog 2565
-RMD160 78aeb646ec0900459eec2ce69c7f89c95e10e2f7 ChangeLog 2565
-SHA256 75473d3e4a70007cb88e77d34dd8ea88ea2c0a4b0e15e7385df302ecf5ff31f5 ChangeLog 2565
+MISC ChangeLog 2748 RMD160 404267250aee20b1abebdea095bcf8f666e8647b SHA1 c60d13f7d47468d2f5b32d051c24f8760dc678d4 SHA256 19566309a19cd6a7296cb70ab74497d06824701262ac5491232c7097e874e6a9
+MD5 14579be4632fa8b949a8e6a3816b8ee7 ChangeLog 2748
+RMD160 404267250aee20b1abebdea095bcf8f666e8647b ChangeLog 2748
+SHA256 19566309a19cd6a7296cb70ab74497d06824701262ac5491232c7097e874e6a9 ChangeLog 2748
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -51,7 +51,7 @@ SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFheH2yuNVb5qfaOYRAhR6AKCN/QSIdtdozo3rqg60u3VxqPlnBwCgrkwY
-kT/iQC7raQN5O+jOmImhMYY=
-=JmJL
+iD8DBQFFi69WyuNVb5qfaOYRAqvUAJ0QqIptTh9syczRs2CylPFaWR9DzgCfZ0z+
+NYq41a+gyzQ9ueuz2RLUKnU=
+=RYtr
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/ipw3945d/files/ipw3945d-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
index e691710ad740967b6c407f21d15ba2c5e2d4291a..d31379d5d539eb640c931a947a41623b1560d926 100644 (file)
--- a/net-wireless/ipw3945d/files/ipw3945d-init.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.3 2006/12/17 19:52:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.4 2006/12/22 10:11:26 phreak Exp $
 
 PIDFILE=/var/run/ipw3945d/ipw3945d.pid
 
@@ -14,7 +14,7 @@ check() {
        if [ -f "${PIDFILE}" ] ; then
                eerror "The pidfile ($PIDFILE) is still present."
                eerror "Please check that the daemon isn't running!"
-               exit 1
+               return 1
        fi
 }