From 3be9e26934175a3da9a08526e9e5da81d61f732d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 25 Mar 2014 18:39:35 +0530 Subject: [PATCH 1/3] Fixed MariaDB install steps in travis --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index c4e2ea57e0..527aaea532 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,14 @@ services: - mysql install: + - sudo service mysql stop + - sudo apt-get install python-software-properties + - sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main' + - sudo apt-get update + - sudo apt-get purge -y mysql-common + - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev + - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop && - pip install --editable . From 059b83a2ceede4787d23888ac2c49ef52f456f4b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 25 Mar 2014 18:40:46 +0530 Subject: [PATCH 2/3] Fixed MariaDB install steps in travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 527aaea532..73b758f72b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ install: - sudo apt-get update - sudo apt-get purge -y mysql-common - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev - - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop && - pip install --editable . From 79196a9ef760ca45bcee1e627914c3fc4c1eca91 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 25 Mar 2014 19:32:06 +0530 Subject: [PATCH 3/3] Fixed install --- erpnext/accounts/doctype/chart_of_accounts/import_charts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/chart_of_accounts/import_charts.py b/erpnext/accounts/doctype/chart_of_accounts/import_charts.py index c8049558cb..f95a4ed5fc 100644 --- a/erpnext/accounts/doctype/chart_of_accounts/import_charts.py +++ b/erpnext/accounts/doctype/chart_of_accounts/import_charts.py @@ -19,8 +19,8 @@ def import_charts(): "source_file": fname, "country": country }).insert() - print bean.doc.name + print bean.doc.name.encode("utf-8") else: - print "No chart for: " + chart.get("name") + print "No chart for: " + chart.get("name").encode("utf-8") frappe.db.commit() \ No newline at end of file