diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2016-10-15 00:48:19 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2016-10-15 00:48:19 +0000 |
| commit | 7a9058b64420a2040be203b75473c83d215d0cc3 (patch) | |
| tree | 9a35df08bd9ebe78fa165e909f82e1ee3f403317 /audio/logitechmediaserver | |
| parent | e6640a97ac18b085f1caeaabf848e83885976a9a (diff) | |
| download | ports-7a9058b64420a2040be203b75473c83d215d0cc3.tar.gz ports-7a9058b64420a2040be203b75473c83d215d0cc3.zip | |
audio/logitechmediaserver: Remove patch-dbix-class-bug.diff
This fixes the scanner.pl program, which would otherwise produce this
error in the log files:
Slim::Schema::Storage::throw_exception (122) Error: DBI Exception:
DBD::SQLite::db do failed: SQL logic error or missing database
cannot ATTACH database within transaction [for Statement "ATTACH
'/var/db/logitechmediaserver/cache/persist.db' AS persistentdb"]
More details about this problem:
http://forums.slimdevices.com/showthread.php?106257-FreeBSD-port&p=864545
Approved by: mark@tranquillussoftware.co.uk (maintainer), adamw (mentor)
Differential Revision: https://reviews.freebsd.org/D8255
Notes
Notes:
svn path=/head/; revision=423998
Diffstat (limited to 'audio/logitechmediaserver')
| -rw-r--r-- | audio/logitechmediaserver/Makefile | 1 | ||||
| -rw-r--r-- | audio/logitechmediaserver/files/patch-dbix-class-bug.diff | 35 |
2 files changed, 1 insertions, 35 deletions
diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile index d2f7646acdf3..91aba5a0d100 100644 --- a/audio/logitechmediaserver/Makefile +++ b/audio/logitechmediaserver/Makefile @@ -2,6 +2,7 @@ PORTNAME= logitechmediaserver PORTVERSION= 7.9.0.g2016.09.30 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= mark@tranquillussoftware.co.uk diff --git a/audio/logitechmediaserver/files/patch-dbix-class-bug.diff b/audio/logitechmediaserver/files/patch-dbix-class-bug.diff deleted file mode 100644 index 1724278b13c9..000000000000 --- a/audio/logitechmediaserver/files/patch-dbix-class-bug.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- scanner.pl.orig 2016-09-30 13:54:28 UTC -+++ scanner.pl -@@ -279,10 +279,6 @@ sub main { - # Perform pre-scan steps specific to the database type, i.e. SQLite needs to copy to a new file - $sqlHelperClass->beforeScan(); - -- # Take the db out of autocommit mode - this makes for a much faster scan. -- # Scanner::Local will commit every few operations -- Slim::Schema->dbh->{'AutoCommit'} = 0; -- - my $scanType = 'SETUP_STANDARDRESCAN'; - - if ($wipe) { -Index: Slim/Schema.pm -=================================================================== ---- Slim/Schema.pm.orig 2016-09-30 13:54:28 UTC -+++ Slim/Schema.pm -@@ -270,12 +270,16 @@ sub _connect { - # For custom exceptions - $class->storage_type('Slim::Schema::Storage'); - -+ # Don't use autocommit mode for the scanner. -+ # Needs to be set here as setting dbh->{'AutoCommit'} = 0 later -+ # confusing the transaction nesting logic. -+ my $AutoCommit = (main::SCANNER ? 0 : 1); - my $sqlHelperClass = Slim::Utils::OSDetect->getOS()->sqlHelperClass(); - my $on_connect_do = $sqlHelperClass->on_connect_do(); - - $class->connection( $dsn || $source, $username, $password, { - RaiseError => 1, -- AutoCommit => 1, -+ AutoCommit => $AutoCommit, - PrintError => 0, - Taint => 1, - on_connect_do => [ |