packages: lyricue/lyricue-mysql.patch - Replaced patch with better fix from...

caleb caleb at pld-linux.org
Thu May 27 15:19:19 CEST 2010


Author: caleb                        Date: Thu May 27 13:19:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Replaced patch with better fix from upstream. https://bugs.launchpad.net/lyricue/+bug/585937

---- Files affected:
packages/lyricue:
   lyricue-mysql.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/lyricue/lyricue-mysql.patch
diff -u packages/lyricue/lyricue-mysql.patch:1.1 packages/lyricue/lyricue-mysql.patch:1.2
--- packages/lyricue/lyricue-mysql.patch:1.1	Wed May 26 18:07:23 2010
+++ packages/lyricue/lyricue-mysql.patch	Thu May 27 15:19:13 2010
@@ -1,12 +1,15 @@
 --- lyricue~	2010-04-01 00:38:48.000000000 +0300
-+++ lyricue	2010-05-26 19:00:05.000000000 +0300
-@@ -9882,6 +9882,9 @@
-     my $dbs = $globals->{'db_available_db'};
-     foreach (keys %$dbs) {
-         my $dbname = $_;
-+        if ($dbname eq 'information_schema') {
-+            next;
-+        }
-         my $db     = db_connect($dbname, $errorcodes->{'bibledbopen'});
-         my @tables = $db->tables;
-         my $table;
++++ lyricue	2010-05-27 16:16:07.000000000 +0300
+@@ -9889,7 +9889,11 @@
+             my $tablename = $_;
+             $tablename =~ s/^.*`(.*)`$/$1/g;
+             $tablename =~ s/^"(.*)"$/$1/g;
+-            my @fields = @{$db->selectall_arrayref("describe ".$tablename)};
++            my $tmpfields = $db->selectall_arrayref("describe " . $tablename);
++            if (!defined $tmpfields) {
++                next;
++            }
++            my @fields = @{$tmpfields};
+             my $a= $fields[0]->[0];
+             if ($a eq "verseid") {
+                 my $query = "SELECT verse FROM ".$tablename." WHERE book=\"Bible\";";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lyricue/lyricue-mysql.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list