Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/griffith/files/
Date: Wed, 04 Jan 2017 10:15:40
Message-Id: 1483524883.7bae02551670dc6a88fc360f32335d4557e1a06b.soap@gentoo
1 commit: 7bae02551670dc6a88fc360f32335d4557e1a06b
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 27 20:03:09 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 10:14:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bae0255
7
8 media-video/griffith: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3255
11
12 .../files/griffith-0.12.1-sqlalchemy-0.7.patch | 39 ----------------------
13 1 file changed, 39 deletions(-)
14
15 diff --git a/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch b/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
16 deleted file mode 100644
17 index d3e6a5b..00000000
18 --- a/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
19 +++ /dev/null
20 @@ -1,39 +0,0 @@
21 -Index: griffith-0.12.1/lib/add.py
22 -===================================================================
23 ---- griffith-0.12.1.orig/lib/add.py
24 -+++ griffith-0.12.1/lib/add.py
25 -@@ -26,7 +26,7 @@ import logging
26 - import os
27 -
28 - import gtk
29 --from sqlalchemy.exceptions import IntegrityError
30 -+from sqlalchemy.exc import IntegrityError
31 -
32 - import quick_filter
33 - import db
34 -Index: griffith-0.12.1/lib/db/tables.py
35 -===================================================================
36 ---- griffith-0.12.1.orig/lib/db/tables.py
37 -+++ griffith-0.12.1/lib/db/tables.py
38 -@@ -64,7 +64,7 @@ movies = Table('movies', metadata,
39 - Column('poster_md5', ForeignKey(posters.c.md5sum)),
40 - Column('loaned', Boolean, nullable=False, default=False),
41 - Column('seen', Boolean, nullable=False, default=False),
42 -- Column('rating', SmallInteger(2)),
43 -+ Column('rating', SmallInteger),
44 - Column('color', SmallInteger),
45 - Column('cond', SmallInteger), # MySQL will not accept name "condition"
46 - Column('layers', SmallInteger),
47 -Index: griffith-0.12.1/lib/sql.py
48 -===================================================================
49 ---- griffith-0.12.1.orig/lib/sql.py
50 -+++ griffith-0.12.1/lib/sql.py
51 -@@ -29,7 +29,7 @@ import logging
52 - import os.path
53 -
54 - from sqlalchemy import create_engine, or_, and_, not_, exists, asc, desc
55 --from sqlalchemy.exceptions import OperationalError
56 -+from sqlalchemy.exc import OperationalError
57 - from sqlalchemy.orm import sessionmaker, scoped_session
58 - from sqlalchemy.sql.expression import Update, Delete
59 -