| 1 |
matsuu 08/11/22 07:28:21 |
| 2 |
|
| 3 |
Modified: puppet-0.24.6-eix.patch |
| 4 |
Log: |
| 5 |
Fixed dependency. Fixed eix patch. |
| 6 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-admin/puppet/files/puppet-0.24.6-eix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: puppet-0.24.6-eix.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- puppet-0.24.6-eix.patch 21 Nov 2008 17:13:40 -0000 1.1 |
| 22 |
+++ puppet-0.24.6-eix.patch 22 Nov 2008 07:28:21 -0000 1.2 |
| 23 |
@@ -1,7 +1,8 @@ |
| 24 |
-diff -Naur puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb puppet-0.24.6/lib/puppet/provider/package/portage.rb |
| 25 |
---- puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb 2008-10-09 22:51:05.000000000 +0900 |
| 26 |
-+++ puppet-0.24.6/lib/puppet/provider/package/portage.rb 2008-11-22 00:47:35.000000000 +0900 |
| 27 |
-@@ -12,7 +12,7 @@ |
| 28 |
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb |
| 29 |
+index ae7194f..5855441 100644 |
| 30 |
+--- a/lib/puppet/provider/package/portage.rb |
| 31 |
++++ b/lib/puppet/provider/package/portage.rb |
| 32 |
+@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa |
| 33 |
defaultfor :operatingsystem => :gentoo |
| 34 |
|
| 35 |
def self.instances |
| 36 |
@@ -10,3 +11,12 @@ |
| 37 |
result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description] |
| 38 |
|
| 39 |
search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}" |
| 40 |
+@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa |
| 41 |
+ end |
| 42 |
+ |
| 43 |
+ def query |
| 44 |
+- result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/ |
| 45 |
++ result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*-]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/ |
| 46 |
+ result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description] |
| 47 |
+ |
| 48 |
+ search_field = package_name.count('/') > 0 ? "--category-name" : "--name" |
Archives