[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. cda832e5d723f1be2bdda097eac2bd668536f20d

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  cda832e5d723f1be2bdda097eac2bd668536f20d (commit)
      from  4ac57d669ccdda9ad10e2b17db7d278b38f28c90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=cda832e5d723f1be2bdda097eac2bd668536f20d

commit cda832e5d723f1be2bdda097eac2bd668536f20d
Author: Sylvain Beucler <address@hidden>
Date:   Sat Mar 13 22:18:17 2010 +0100

    sbin/sv: works independently of pwd

diff --git a/savane/backend/__init__.py b/savane/backend/__init__.py
index 2f4bab7..581211a 100644
--- a/savane/backend/__init__.py
+++ b/savane/backend/__init__.py
@@ -24,6 +24,9 @@ def wrapper():
     Load python savane.backend submodule specified on the first
     argument of the command line
     """
+    if len(sys.argv) == 1:
+        print "Usage: %s command" % sys.argv[0]
+        sys.exit(1)
     command_name = sys.argv[1]
     (f, path, descr) = imp.find_module(command_name, __path__)
     imp.load_module(command_name, f, path, descr)
diff --git a/sbin/sv b/sbin/sv
index 8098894..7fb9855 100755
--- a/sbin/sv
+++ b/sbin/sv
@@ -24,8 +24,8 @@ import os, sys
 if not os.environ.has_key('DJANGO_SETTINGS_MODULE'):
     os.environ['DJANGO_SETTINGS_MODULE'] = 'settings';
 
-if os.path.exists('../savane'): # debug
-    sys.path.insert(0, '..')
+if os.path.exists(os.path.join(os.path.dirname(__file__), '../savane')): # 
debug
+    sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 import savane.backend
 savane.backend.wrapper()
diff --git a/settings_default.py b/settings_default.py
index 67c477b..5e2cf6c 100644
--- a/settings_default.py
+++ b/settings_default.py
@@ -63,12 +63,12 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or 
"C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.dirname(__file__) + '/templates',
+    os.path.join(os.path.dirname(__file__), 'templates'),
 )
 
 
 # Applications media
-STATIC_MEDIA_ROOT = os.path.dirname(__file__) + '/static_media/'
+STATIC_MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'static_media/')
 STATIC_MEDIA_URL = '/static_media/'
 
 # Media for Django auto-admin

-----------------------------------------------------------------------

Summary of changes:
 savane/backend/__init__.py |    3 +++
 sbin/sv                    |    4 ++--
 settings_default.py        |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework