projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cfa4432)
Added '|| die' where missing, wrt bug #393287
authorAgostino Sarubbo <ago@gentoo.org>
Thu, 15 Dec 2011 20:40:48 +0000 (20:40 +0000)
committerAgostino Sarubbo <ago@gentoo.org>
Thu, 15 Dec 2011 20:40:48 +0000 (20:40 +0000)
Package-Manager: portage-2.1.10.40/cvs/Linux i686

dev-vcs/mercurial/ChangeLog patch | blob | history
dev-vcs/mercurial/Manifest patch | blob | history
dev-vcs/mercurial/mercurial-2.0.1.ebuild patch | blob | history

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 6082fce6b072160f3005da06a429050489addb06..2cbf05664d18ab2474101287923871379f7ec627 100644 (file)
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.60 2011/12/14 23:24:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.61 2011/12/15 20:40:48 ago Exp $
+
+  15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> mercurial-2.0.1.ebuild:
+  Added '|| die' where missing, wrt bug #393287
 
   14 Dec 2011; Markus Meier <maekke@gentoo.org> mercurial-2.0.ebuild:
   arm stable, bug #393265
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index c43503e98165c5c241350f672a1e05706849ebed..2b37c24a82a15be7489a42a29826cc7779e36635 100644 (file)
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
 DIST mercurial-2.0.1.tar.gz 3128233 RMD160 1c2e84fb5ac1eef3dbdd64f16e76e99fdf34fc98 SHA1 7983f564c06aef598fcfd7f8c1c33f4669362760 SHA256 6b9e6870e21e7161bb2e44c09e078e622ad7dd46bf5a122d3155319919dc1b38
 DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b1 SHA1 5ede1b3f54d3be2af0657901e7013dde7c19b7c5 SHA256 affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
-EBUILD mercurial-2.0.1.ebuild 3777 RMD160 bb25afb323ff55103dd361cb108a458773461a83 SHA1 675e4b6064ad98fbf24e9b84747b519688624797 SHA256 a7e1d50c63c5fda870259f84f5ca29830d9b5c3ad805698ee40fdbbc0670deca
+EBUILD mercurial-2.0.1.ebuild 4004 RMD160 befdda02423006766c38e5183f38cae7d7919014 SHA1 ecf51cdcce5b7970032e018264a11820b233a5cc SHA256 cd98be5ccec551516d3d3a7072e467629a2f36e1fb7df1ef34ad3e44d21dad40
 EBUILD mercurial-2.0.ebuild 3774 RMD160 f3356dff3f251d71a52abda95d9e468333c57d23 SHA1 a16d1c455dfcdfb88042f54ef4c4f1605bde9a61 SHA256 684ecd5998c92c5214c57832d01808d86eb9dba0575942b9d14aea463292ed2e
 EBUILD mercurial-9999.ebuild 3400 RMD160 da98241f4ac161e92e1bd2edf1d376e3fa8287cc SHA1 868f8eeec559b0187e823f5de9778ca2f3f7c10f SHA256 5d2c3e7445864f34459c1cf74783ff2518cf6a3c675705ce18c515b535e094b0
-MISC ChangeLog 26287 RMD160 f27dbb0f9292f7e6dcf67358bec2b1024ee7a8e1 SHA1 e10071951d81dbaf2f960647da9f46c955a6328a SHA256 bbdb9a94ac3e5cba14642cb203f0c6c8c2c0338921a57feb05651c0fbc482341
+MISC ChangeLog 26406 RMD160 15638dc3ad1e016604f4fa56eb333f1b15707337 SHA1 1456ae8c6ff99cff95ba3b7e28ecdabb244cf6d3 SHA256 3ed7efcf0e7ef119989c59f512de30d0903d6c9e7ee29ffe09969f64166b8f8f
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7pMLkACgkQkKaRLQcq0GKUhQCfdF48qKPg8w6hGb9zHI9dgVsL
-8EsAoIKVTenmNn/nU+TTQlxPnNHnzVjk
-=0JKS
+iQEcBAEBCgAGBQJO6ltsAAoJEOTDgjZ80txdeckH/0tXspGXIRvM9o4KEfJgzcpB
+7vhTXZa46hZfbKjbuzTEnyBAtB5cUXGGNtiVG7NSZ5nJPttMrhniqTu0F6XRKPfX
+4CB0rY55dYwSh8P5vXY2JbqGDyXlGQ4wUyL3IdcXb60JC/+hclSuRdsfZn4CyISq
+sZpEJrbaAB6QtI80Uk/JrRkS7BYUQsdkIqDdPdaybfU5hF56WuNsB1aueOEq0G4t
+umwIFLZ+GZCYhgCi29wj6lk1ggN3I+YQBtWaWjJF42b65PWlzwrgxY24+9nNvbIq
+IS4m1G50nIxTApswz8NuW/6dNIuvkyEbcfvbSB0MON8EeevE796utxSvp1KKZTc=
+=sbhv
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.0.1.ebuild b/dev-vcs/mercurial/mercurial-2.0.1.ebuild
index a6800a5ae4918aa0adfda10664808c18904ce824..100a9b85e5aa44eae4a5894ab5eadc8f007b54d2 100644 (file)
--- a/dev-vcs/mercurial/mercurial-2.0.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.0.1.ebuild,v 1.1 2011/12/05 11:45:11 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.0.1.ebuild,v 1.2 2011/12/15 20:40:48 ago Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -47,11 +47,11 @@ src_compile() {
        distutils_src_compile
 
        if use emacs; then
-               cd "${S}"/contrib
+               cd "${S}"/contrib || die
                elisp-compile mercurial.el || die "elisp-compile failed!"
        fi
 
-       rm -rf contrib/{win32,macosx}
+       rm -rf contrib/{win32,macosx} || die
 }
 
 src_install() {
@@ -61,27 +61,27 @@ src_install() {
 
        if use zsh-completion ; then
                insinto /usr/share/zsh/site-functions
-               newins contrib/zsh_completion _hg
+               newins contrib/zsh_completion _hg || die
        fi
 
-       rm -f doc/*.?.txt
-       dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
-       cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
+       rm -f doc/*.?.txt || die
+       dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
+       cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
 
-       dobin hgeditor
-       dobin contrib/hgk
-       dobin contrib/hg-ssh
+       dobin hgeditor || die
+       dobin contrib/hgk || die
+       dobin contrib/hg-ssh || die
 
-       rm -f contrib/hgk contrib/hg-ssh
+       rm -f contrib/hgk contrib/hg-ssh || die
 
-       rm -f contrib/bash_completion
-       cp -r contrib "${ED}"/usr/share/doc/${PF}/
-       doman doc/*.?
+       rm -f contrib/bash_completion || die
+       cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
+       doman doc/*.? || die
 
        cat > "${T}/80mercurial" <<-EOF
 HG="${EPREFIX}/usr/bin/hg"
 EOF
-       doenvd "${T}/80mercurial"
+       doenvd "${T}/80mercurial" || die
 
        if use emacs; then
                elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
@@ -90,31 +90,31 @@ EOF
 }
 
 src_test() {
-       cd "${S}/tests/"
-       rm -rf *svn*                            # Subversion tests fail with 1.5
-       rm -f test-archive                      # Fails due to verbose tar output changes
-       rm -f test-convert-baz*         # GNU Arch baz
-       rm -f test-convert-cvs*         # CVS
-       rm -f test-convert-darcs*       # Darcs
-       rm -f test-convert-git*         # git
-       rm -f test-convert-mtn*         # monotone
-       rm -f test-convert-tla*         # GNU Arch tla
-       rm -f test-doctest*                     # doctest always fails with python 2.5.x
+       cd "${S}/tests/" || die
+       rm -rf *svn* || die                     # Subversion tests fail with 1.5
+       rm -f test-archive || die               # Fails due to verbose tar output changes
+       rm -f test-convert-baz* || die          # GNU Arch baz
+       rm -f test-convert-cvs* || die          # CVS
+       rm -f test-convert-darcs* || die        # Darcs
+       rm -f test-convert-git* || die          # git
+       rm -f test-convert-mtn* || die          # monotone
+       rm -f test-convert-tla* || die          # GNU Arch tla
+       rm -f test-doctest* || die              # doctest always fails with python 2.5.x
        if [[ ${EUID} -eq 0 ]]; then
                einfo "Removing tests which require user privileges to succeed"
-               rm -f test-command-template     # Test is broken when run as root
-               rm -f test-convert                      # Test is broken when run as root
-               rm -f test-lock-badness         # Test is broken when run as root
-               rm -f test-permissions          # Test is broken when run as root
-               rm -f test-pull-permission      # Test is broken when run as root
-               rm -f test-clone-failure
-               rm -f test-journal-exists
-               rm -f test-repair-strip
+               rm -f test-command-template || die      # Test is broken when run as root
+               rm -f test-convert || die               # Test is broken when run as root
+               rm -f test-lock-badness || die          # Test is broken when run as root
+               rm -f test-permissions  || die          # Test is broken when run as root
+               rm -f test-pull-permission || die       # Test is broken when run as root
+               rm -f test-clone-failure || die
+               rm -f test-journal-exists || die
+               rm -f test-repair-strip || die
        fi
 
        testing() {
                local testdir="${T}/tests-${PYTHON_ABI}"
-               rm -rf "${testdir}"
+               rm -rf "${testdir}" || die
                "$(PYTHON)" run-tests.py --tmpdir="${testdir}"
        }
        python_execute_function testing
Unnamed repository; edit this file 'description' to name the repository.