Fix get_distribution() function, new revision

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

4 files changed, 36 insertions, 4 deletions

diff --git a/app-admin/ansible/ChangeLog b/app-admin/ansible/ChangeLog
index de1db4ab89f3..a7f4cff4a956 100644
--- a/app-admin/ansible/ChangeLog
+++ b/app-admin/ansible/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ansible
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.9 2013/01/10 08:41:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ChangeLog,v 1.10 2013/01/10 13:24:53 pinkbyte Exp $
+
+*ansible-0.9-r1 (10 Jan 2013)
+
+  10 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> -ansible-0.9.ebuild,
+  +ansible-0.9-r1.ebuild, +files/ansible-0.9-distribution-fix.patch:
+  Fix get_distribution() function, new revision
 
   10 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> ansible-0.9.ebuild,
   ansible-9999.ebuild:
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index be8302113c8f..8180aa776951 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,11 @@
+AUX ansible-0.9-distribution-fix.patch 902 SHA256 70d3c64a3a689ca1a00bb8982b49993c5dc04ef6abc0087fce0de910900674ad SHA512 03e9d47e46fc4993b710c2c00fa7b8fdb1fae2e4369628db29709b1aff3cf0ff7924cbae228933651329e53742b49130ffc5d13bc272dd015cf2942ee1696abd WHIRLPOOL 66af6b2f104d869a7a5c76b08bcb807fbf0c9ecf426cf1d119466d2a579ad0cdcd1b40e2bd33d728913d8445fdeb64e93e939653b809ce2ac0e322fc37623cf9
 AUX ansible.env 99 SHA256 04a806ca12249b1b1387e17cabd85c8b09bac64914650d7a776576153e32591f SHA512 79d0d6581116ede67d6b184d1a16c2ba6586d4ca8cd71047bc5a81a82696b0e1a124f22248877aefc0a810f0ae3bd2724dadaf71dd5078bbe0910a9e8c3ab111 WHIRLPOOL f347143d490cf1dd6784059022fb7c6c85eaa5e957b6b5eb85f6b1b8a98d1b90c26aa0602fe2cd6679c4709fb9dad2fa67bc53326bfca80205cb7b7ded757c90
 DIST ansible-0.7.2.tar.gz 140922 SHA256 4eacbb7b08f0f7d67d41c58a275296c8babdae805b94e55e112267c03edcbf84 SHA512 0ec4115ebaa0bf9f1626540a85e6a99aaee3599231d29d972ed1fbe0e40b96ee8addbada5c038422472a6e86a39a107e85e703dcba48344ec9040bf1c4d869a1 WHIRLPOOL d8c8111211d3a56d49118cd58bcc1a33c5160045ba20db08d0647b240a79dea49b1cb47bf6dbd6b3a6ea0eb79091fedf8b51463f6e5d3592680749c1188008bd
 DIST ansible-0.8.tar.gz 573661 SHA256 04f8cab0136f048c55699e543170b261b32b1e09afaee42e2bb41dcbb7d7dde0 SHA512 56875e8ae6cf738e46a1da8d6fb1b2ddd1ceaffc4e917c40b95c243839234fc93673deebe4adbfb1b90312b5805cd9172692dc6f54964a82ea4f8d7920ef5ccd WHIRLPOOL f677c0e8e9b184a27724aa5e5082cde146124fa86eb64a5e015efe8f872d5c5b93a4a590a34df8d8009f97c62146398410297f16c50e54be7767d6d36a1234c4
 DIST ansible-0.9.tar.gz 603309 SHA256 55ba3ca0aeedf9b212b402bc36f206378b3d9151727b35b0b1eda90d7b07da27 SHA512 f1daff617cf0816543190b5f67a55d8addddfb90936023bc93d02e603bb3e4a552240484285ea0dcc5776e58cfc802bcf6e552c10c72c6f4ff09bc0df668fc58 WHIRLPOOL 6388cc9663e16211a7f80ba407ade396029e0f30eb540609cd09830b9277d38df81e7a9e23a0873fc5d9e7e76bc6eb34ba019f0e4aac58c467afb4214366a298
 EBUILD ansible-0.7.2.ebuild 1698 SHA256 dcf0001c0b04ec04d0952f148b24d8a341badde1047aafdc8ec512b1863676bd SHA512 765f4a52288a0af0429a8e987d9d35e432aaaf3bc58e0c17f8680350ff3d693a229aeb359a29446e73dc7c3dfb8b4578655bd08c99397a58482859c9faf97a46 WHIRLPOOL 3c3020f59a330b1d153592d9c6b9a985145ff6807b503cb7e7063924ce35a83f310f9b942393245deef3b9b44ddb202c344cbbe6700686fa78240404196eea5e
 EBUILD ansible-0.8.ebuild 1696 SHA256 66ac44a9b82738c136991b1cb96a9c1b59813e624c12b62160237328bfa5528b SHA512 013cf345ec50691d8ed99b451bf9f1d79050bfa8603f13f2144074662e3e1e8a702931bd30cd8e1923059cb289d665e5d323e96d6749368f5a17a29a90e67f07 WHIRLPOOL 7835db61e5d43cc6e152eac5dfbfe3bd21f233ee8364379eb118c11b9c6ecd562591821a3650cee66fcb98a2f9060ec4b3f33da10a8c60badfe555f993bcc24d
-EBUILD ansible-0.9.ebuild 1719 SHA256 711f570a860da184acb78ae189f4554c0d9129a64537972224370275809590a4 SHA512 aaa4564894186f387c6da0e0e9bbbe93d94597cdb4c98e101169ac22d8cc77d9e8f3364a40ea87866582e57bbd39cfd78b49100f5c03a28c5176b1892d90bf6a WHIRLPOOL 1e66ad02d8c7932b758799c7ea445bc36e098fbc4b18e033cf930b2e7611d340d213c088777042980fb9b0eb09a3369abdf0d47864a07b3812cc921b26e2398e
+EBUILD ansible-0.9-r1.ebuild 1777 SHA256 8c6731be4543456dc6b98d15c2ebea486391c1ad257190ab0c68423ac541a878 SHA512 1937f761e8a28c2f1638059459eb7b1c1724e039c50e453ec0de8fc71a61886463dd4243cc14c61165a2cf1bcd5b1334d289849130e2aff5aa13e61ed4fa23ab WHIRLPOOL 85a2668967b639e0a5c882bee7c8c01d8e59f548774a9626e57709fcab61503cfb074ee713cea50ca2fbb43ffc73d1f793a781162be67bc4d689cda3e32f8c9d
 EBUILD ansible-9999.ebuild 1720 SHA256 ec8deb02582f630a595f6bae0448d99ae19c0672c6f3527e922f9a45e68037b1 SHA512 c8cc8773c965e2c7c3218dd7f833d2f5854fcceb895b85d11660ec368dd6b00dac4413c4dd9e1b407f72b37f56687dd221f88a1958d805f07d546b7ae2347289 WHIRLPOOL c8b066342802fb4e394ad5cf6e22dd8d5e305d34f52edd2df310f9ccd9726fff2af7f2c818e0159caf3c1d3ce75144fb89229813d19d03fcc2c32a2d29c82171
-MISC ChangeLog 1704 SHA256 0a3b9f0e848a096d844036f20f1170fa6229eea4def51911b6791f2d7a4fc742 SHA512 f3e83f9f4a799f5cf5914dcf479fe47b28b56b14bc51f10aecc86374c03165253a68aa6ce6236847cc0793eed32b8348b64506d1a861640b39c6148210cbe6e0 WHIRLPOOL 8945edc6767b37a38f73884aea8a1aed91dffb1c1a2b7e11bb251d8f1b35c2acb78c8b02a373c1c53f5610f45904e67d1b10d19300b80a3f023fd4663273fab2
+MISC ChangeLog 1925 SHA256 7981bebd942b72c01b9d797246e4e627eb0b87a7034d71df012668200ece21a9 SHA512 7db3e45a8b7d7584311f56796aefa1d887c3ac4f2678d1ed94249e36f1c50326af05cd189f19bd121d8636c939d20ea06059e152eb0ff508936ad0ff41524142 WHIRLPOOL b7b548cf8617af9d285b8fe5829334d53c2660a5386df25851e60af199036e03056e03db09246f698e9ee947ede83359dc843608e1c8171ac0518ac3392dd301
 MISC metadata.xml 797 SHA256 4f1cd2cc212b4f25b5855d0d63962624ea62927bc336a5b8f589e2a541dfd091 SHA512 145019e574064431624824df42213b52b8f464d6ff098aec05bebb022d63b817e6e5f791e8153741850e051f5b3d4c91b20a06a4b2e05465c96ffb3dfbf5b0a7 WHIRLPOOL e5e7c98f351f2ab0e586f91fbd33f3e44f01d58459c71af2c6899ac98e71f1330bbc3309cd3803598e2d3e6e2b6dadf3424bb84894a8dbc788b03abc5fb9d4e2
diff --git a/app-admin/ansible/ansible-0.9.ebuild b/app-admin/ansible/ansible-0.9-r1.ebuild
index 2500dc837a53..85274c839fd8 100644
--- a/app-admin/ansible/ansible-0.9.ebuild
+++ b/app-admin/ansible/ansible-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-0.9.ebuild,v 1.2 2013/01/10 08:41:32 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-0.9-r1.ebuild,v 1.1 2013/01/10 13:24:53 pinkbyte Exp $
 
 EAPI="5"
 
@@ -33,6 +33,8 @@ RDEPEND="
 	sudo? ( app-admin/sudo )
 "
 
+PATCHES=( "${FILESDIR}/${P}-distribution-fix.patch" )
+
 src_prepare() {
 	distutils-r1_src_prepare
 	# Skip tests which need ssh access
diff --git a/app-admin/ansible/files/ansible-0.9-distribution-fix.patch b/app-admin/ansible/files/ansible-0.9-distribution-fix.patch
new file mode 100644
index 000000000000..58841ea7bfc1
--- /dev/null
+++ b/app-admin/ansible/files/ansible-0.9-distribution-fix.patch
@@ -0,0 +1,23 @@
+commit e41f89d507ec92339bf8751e1f5fd72233ff299d
+Author: Sergey Popov <admin@pinkbyte.ru>
+Date:   Thu Jan 10 15:08:00 2013 +0400
+
+    Fix distribution detection - return string instead of functions
+
+diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py
+index 3db8439..882e5cd 100644
+--- a/lib/ansible/module_common.py
++++ b/lib/ansible/module_common.py
+@@ -96,10 +96,10 @@ def get_distribution():
+     ''' return the distribution name '''
+     if platform.system() == 'Linux':
+         try:
+-            distribution = platform.linux_distribution()[0].capitalize
++            distribution = platform.linux_distribution()[0].capitalize()
+         except:
+             # FIXME: MethodMissing, I assume?
+-            distribution = platform.dist()[0].capitalize
++            distribution = platform.dist()[0].capitalize()
+     else:
+         distribution = None
+     return distribution