Mercurial > kallithea

changeset 6798:6ca4f9f68eb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make-index: move make_index.lock to the index location - don't assume that the .ini directory is writable
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 12 Aug 2017 17:40:01 +0200
parents d8b7a1a023a6
children 5aa9fa97306f
files kallithea/lib/paster_commands/make_index.py kallithea/tests/fixture.py
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/paster_commands/make_index.py	Sun Jun 11 16:56:12 2017 +0200
+++ b/kallithea/lib/paster_commands/make_index.py	Sat Aug 12 17:40:01 2017 +0200
@@ -57,8 +57,7 @@
         from kallithea.lib.pidlock import LockHeld, DaemonLock
         from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
         try:
-            l = DaemonLock(file_=os.path.join(dirname(dirname(index_location)),
-                                              'make_index.lock'))
+            l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
             WhooshIndexingDaemon(index_location=index_location,
                                  repo_location=repo_location,
                                  repo_list=repo_list,
--- a/kallithea/tests/fixture.py	Sun Jun 11 16:56:12 2017 +0200
+++ b/kallithea/tests/fixture.py	Sat Aug 12 17:40:01 2017 +0200
@@ -411,7 +411,7 @@
     if not os.path.exists(index_location):
         os.makedirs(index_location)
 
-    l = DaemonLock(file_=os.path.join(dirname(index_location), 'make_index.lock'))
+    l = DaemonLock(file_=os.path.join(index_location, 'make_index.lock'))
     WhooshIndexingDaemon(index_location=index_location,
                          repo_location=repo_location) \
         .run(full_index=full_index)