[DRE-commits] [diaspora] 12/14: bring back DB variable

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora.

commit eaf9f02498a6906cb46d1aaeb542ff624aa6c61d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Sep 19 21:04:34 2016 +0530

    bring back DB variable
---
 debian/patches/060-use-db-env.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/060-use-db-env.patch b/debian/patches/060-use-db-env.patch
new file mode 100644
index 0000000..edcfb6a
--- /dev/null
+++ b/debian/patches/060-use-db-env.patch
@@ -0,0 +1,26 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -62,12 +62,17 @@
+ 
+ # Database
+ 
+-group :mysql, optional: true do
+-  gem "mysql2", "~> 0.4.4"
+-end
+-group :postgresql, optional: true do
+-  gem "pg",     "~> 0.18.4"
+-end
++ENV["DB"] ||= "mysql"
++
++gem "mysql2", "~> 0.4.4" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
++gem "pg",     "~> 0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
++
++#group :mysql, optional: true do
++#  gem "mysql2", "~> 0.4.4"
++#end
++#group :postgresql, optional: true do
++#  gem "pg",     "~> 0.18.4"
++#end
+ 
+ 
+ gem "activerecord-import", "~> 0.15.0"
diff --git a/debian/patches/series b/debian/patches/series
index bcb402e..25dbfce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 043-dont-do-git-checks.patch
 044-work-around-sprockets3.patch
 050-relax-libs.patch
+060-use-db-env.patch
 0100-set-rails-root.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git