| 1 |
commit: d56a5254e0c24409d27a5f6a811e57ea1ecd7f7a |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 09:58:55 2011 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 09:58:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/fordfrog.git;a=commit;h=d56a5254 |
| 7 |
|
| 8 |
dev-db/pgfouine: fixed error with hints existing for non-error log lines |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/pgfouine/ChangeLog | 6 +++++ |
| 12 |
dev-db/pgfouine/Manifest | 5 ++- |
| 13 |
.../files/disable-hints-for-non-errors.patch | 22 ++++++++++++++++++++ |
| 14 |
...{pgfouine-1.2.ebuild => pgfouine-1.2-r1.ebuild} | 3 ++ |
| 15 |
4 files changed, 34 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/pgfouine/ChangeLog b/dev-db/pgfouine/ChangeLog |
| 18 |
index cd1a773..fc353a0 100644 |
| 19 |
--- a/dev-db/pgfouine/ChangeLog |
| 20 |
+++ b/dev-db/pgfouine/ChangeLog |
| 21 |
@@ -2,6 +2,12 @@ |
| 22 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+*pgfouine-1.2-r1 (30 Jun 2011) |
| 26 |
+ |
| 27 |
+ 30 Jun 2011; Miroslav Šulc <fordfrog@g.o> -pgfouine-1.2.ebuild, |
| 28 |
+ +pgfouine-1.2-r1.ebuild, +files/disable-hints-for-non-errors.patch: |
| 29 |
+ Fixed error with hints existing for non-error log lines |
| 30 |
+ |
| 31 |
30 Jun 2011; Miroslav Šulc <fordfrog@g.o> pgfouine-1.2.ebuild: |
| 32 |
Added dependencies on php modules |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/dev-db/pgfouine/Manifest b/dev-db/pgfouine/Manifest |
| 36 |
index 551727a..0367766 100644 |
| 37 |
--- a/dev-db/pgfouine/Manifest |
| 38 |
+++ b/dev-db/pgfouine/Manifest |
| 39 |
@@ -1,4 +1,5 @@ |
| 40 |
+AUX disable-hints-for-non-errors.patch 744 RMD160 eb110c7870b4ee8c44841714ce0f57059a5725b6 SHA1 6bf0e4dc414fd9444382de1e3c9906b6ffaad856 SHA256 647ae25fee5d83fd43ac479d628c19c6140c25de8c47043e4e9a72a89cd4a1f6 |
| 41 |
DIST pgfouine-1.2.tar.gz 793004 RMD160 126c8ac1d65e32e093db9f9b510f3d6a5a663237 SHA1 aca54b34d93a6b1faa2c55b382b9f0742fce081d SHA256 6c5b753d7c14744cd23021d327016040cd86e14d29c055babf556ee2160a17fd |
| 42 |
-EBUILD pgfouine-1.2.ebuild 1159 RMD160 08ac14fc9812e7fae69ffce1672fd56ed0e3a2b2 SHA1 7e54a25b33a3a273148a3bf44c5e7238d8b56373 SHA256 21801d0b6114f20b72fec1b79f3afb662ed704bd8480081ed85960761007e7d1 |
| 43 |
-MISC ChangeLog 439 RMD160 ecca13416bce8a7e2519843ec1c4ee3a527fbf1b SHA1 77315d8893b15fc71df935f6df241d76c7891206 SHA256 bf333e0804e531df6751bdb3db065dbeedf38bf13cd42909de46dc1c08f33c9d |
| 44 |
+EBUILD pgfouine-1.2-r1.ebuild 1362 RMD160 80bee8d3dcca7434ff2f219b4a22d526fe407568 SHA1 273662a7bdfb4f9284b8bde41b86e0f963f7c00e SHA256 88c1de1e6cf040e08bf23fbd2039a66d1e1e2a7603060277f645aa0fb50b8146 |
| 45 |
+MISC ChangeLog 674 RMD160 0643f7408c73d138c7e45f70a6f0a7eb6b454501 SHA1 6ee1f7f87aa73f5c6e0182e0dc66916689dc893f SHA256 02cdfba2637f220acbe1ad85ec1e7b7a303c06f85f063fe0dc5d592792c9bbbe |
| 46 |
MISC metadata.xml 257 RMD160 743513e54bce621fb29181c8f2c9bc9521f83c12 SHA1 6e6259d3bca13f00ad4e47d103c78a856fcdec7a SHA256 ca5a181e2b7199de87f8012a08f0d58b12de37e4a4cd8e4659e0dad86f774892 |
| 47 |
|
| 48 |
diff --git a/dev-db/pgfouine/files/disable-hints-for-non-errors.patch b/dev-db/pgfouine/files/disable-hints-for-non-errors.patch |
| 49 |
new file mode 100644 |
| 50 |
index 0000000..fab176d |
| 51 |
--- /dev/null |
| 52 |
+++ b/dev-db/pgfouine/files/disable-hints-for-non-errors.patch |
| 53 |
@@ -0,0 +1,22 @@ |
| 54 |
+diff --git a/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php b/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php |
| 55 |
+index 274f238..f23debd 100644 |
| 56 |
+--- a/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php |
| 57 |
++++ b/pgfouine-1.2/include/postgresql/lines/PostgreSQLHintLine.class.php |
| 58 |
+@@ -25,7 +25,9 @@ class PostgreSQLHintLine extends PostgreSQLLogLine { |
| 59 |
+ var $ignore = false; |
| 60 |
+ |
| 61 |
+ function appendTo(& $logObject) { |
| 62 |
+- $logObject->appendHint($this->text); |
| 63 |
++ if (method_exists($logObject, 'appendHint')) { |
| 64 |
++ $logObject->appendHint($this->text); |
| 65 |
++ } |
| 66 |
+ } |
| 67 |
+ |
| 68 |
+ function isContextual() { |
| 69 |
+@@ -33,4 +35,4 @@ class PostgreSQLHintLine extends PostgreSQLLogLine { |
| 70 |
+ } |
| 71 |
+ } |
| 72 |
+ |
| 73 |
+-?> |
| 74 |
+\ No newline at end of file |
| 75 |
++?> |
| 76 |
|
| 77 |
diff --git a/dev-db/pgfouine/pgfouine-1.2.ebuild b/dev-db/pgfouine/pgfouine-1.2-r1.ebuild |
| 78 |
similarity index 85% |
| 79 |
rename from dev-db/pgfouine/pgfouine-1.2.ebuild |
| 80 |
rename to dev-db/pgfouine/pgfouine-1.2-r1.ebuild |
| 81 |
index 42fadc2..2ccb529 100644 |
| 82 |
--- a/dev-db/pgfouine/pgfouine-1.2.ebuild |
| 83 |
+++ b/dev-db/pgfouine/pgfouine-1.2-r1.ebuild |
| 84 |
@@ -22,6 +22,9 @@ RDEPEND=">=dev-lang/php-4[gd,truetype]" |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
find -name CVS -type d | xargs rm -fr |
| 88 |
+ # some logs may contain hints even for non-error log lines |
| 89 |
+ # this patch disables adding hints to log objects that do not have appendHint() method |
| 90 |
+ epatch ${FILESDIR}/disable-hints-for-non-errors.patch |
| 91 |
} |
| 92 |
|
| 93 |
src_configure() { |
Archives