From e0f53fd6ad84dd6a082b50d060deed050afa29ef Mon Sep 17 00:00:00 2001
From: f3flight <f3flight@gmail.com>
Date: Tue, 2 Aug 2016 12:23:58 +0000
Subject: [PATCH] Move default rqfile to rq directory

---
 MANIFEST.in   | 1 -
 setup.py      | 2 +-
 timmy/conf.py | 6 ++----
 timmy/env.py  | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index d6720ea..90af84b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ recursive-include rq *
 recursive-include doc *
 include README.md
 include config.yaml
-include rq.yaml
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 90309d8..e024276 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ pname = project_name
 dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname)
 rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files])
            for root, dirs, files in os.walk('rq')]
-rqfiles.append((os.path.join(dtm, 'configs'), ['config.yaml', 'rq.yaml']))
+rqfiles.append((os.path.join(dtm, 'configs'), ['config.yaml']))
 package_data = True
 
 if os.environ.get("READTHEDOCS", False):
diff --git a/timmy/conf.py b/timmy/conf.py
index a5f8d63..989e4c5 100644
--- a/timmy/conf.py
+++ b/timmy/conf.py
@@ -39,15 +39,13 @@ def load_conf(filename):
     conf['timeout'] = 15
     conf['prefix'] = 'nice -n 19 ionice -c 3'
     rqdir = 'rq'
-    rqfile = 'rq.yaml'
+    rqfile = 'rq/default.yaml'
     dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', 'timmy')
     if os.path.isdir(os.path.join(dtm, rqdir)):
         conf['rqdir'] = os.path.join(dtm, rqdir)
+        conf['rqfile'] = os.path.join(conf['rqdir'], rqfile)
     else:
         conf['rqdir'] = rqdir
-    if os.path.isfile(os.path.join(dtm, 'configs', rqfile)):
-        conf['rqfile'] = os.path.join(dtm, 'configs', rqfile)
-    else:
         conf['rqfile'] = rqfile
     conf['compress_timeout'] = 3600
     conf['outdir'] = os.path.join(gettempdir(), 'timmy', 'info')
diff --git a/timmy/env.py b/timmy/env.py
index 2c9bb8b..6979d63 100644
--- a/timmy/env.py
+++ b/timmy/env.py
@@ -16,7 +16,7 @@
 #    under the License.
 
 project_name = 'timmy'
-version = '1.12.0'
+version = '1.12.2'
 
 if __name__ == '__main__':
     exit(0)