[Debian-islamic-commits] [thawab] 04/10: Added mdbtools-0.7.diff patch to fix incompatibility with mdbtools 0.7

[أحمد المحمودي (Ahmed El-Mahmoudy)]

This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository thawab.

commit 9401391fae542d06543feb8acf9fe29ada13c5af
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Nov 22 09:13:59 2013 +0200

    Added mdbtools-0.7.diff patch to fix incompatibility with mdbtools 0.7
    
    Closes: #704907
    LP: #1112821
---
 debian/patches/mdbtools-0.7.diff |   25 +++++++++++++++++++++++++
 debian/patches/series            |    1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/mdbtools-0.7.diff b/debian/patches/mdbtools-0.7.diff
new file mode 100644
index 0000000..e207258
--- /dev/null
+++ b/debian/patches/mdbtools-0.7.diff
@@ -0,0 +1,25 @@
+Description: Fix for mdbtools 0.7
+Bug-Debian: http://bugs.debian.org/704907
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/thawab/+bug/1112821
+Forwarded: yes
+
+--- a/Thawab/shamelaUtils.py
++++ b/Thawab/shamelaUtils.py
+@@ -206,7 +206,7 @@
+     if is_tmp: temp='temp'
+     else: temp=''
+     fn=self._getTableFile(Tb)
+-    pipe=Popen(['mdb-schema', '-S','-T', Tb, fn], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
++    pipe=Popen(['mdb-schema', '-T', Tb, fn], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
+     r=pipe.communicate()[0].replace('\r','')
+     if pipe.returncode!=0: raise TypeError
+     sql=schema_fix_text.sub('TEXT',schema_fix_int.sub('INETEGER',schema_fix_del.sub('',r))).lower()
+@@ -239,7 +239,7 @@
+     if Tb in self.imported_tables: return
+     self.importTableSchema(Tb, tb, is_tmp, tb_prefix)
+     fn=self._getTableFile(Tb)
+-    pipe=Popen(['mdb-export', '-R',';\n'+mark,'-I', fn, Tb], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
++    pipe=Popen(['mdb-export', '-R','\n'+mark,'-I', 'postgres', fn, Tb], 0, stdout=PIPE,env={'MDB_JET3_CHARSET':'cp1256', 'MDB_ICONV':'UTF-8'})
+     sql_cmd=[]
+     prefix=""
+     if is_ignore: prefix="OR IGNORE INTO "
diff --git a/debian/patches/series b/debian/patches/series
index fd5d954..f132d23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ private-pkg.diff
 separate_setup.py.diff
 desktop-categories.diff
 whoosh-2.5.diff
+mdbtools-0.7.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-islamic/packages/thawab.git