From 773797c76f9dc73c0289eea3f68ec5e4cb65f1c2 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 4 Jun 2012 10:26:14 +0200 Subject: [PATCH] [Rigo] do not override DATA_DIR and ICON_PATH with relative paths, fix bug 3370 --- rigo/debug_rigo.sh | 2 ++ rigo/rigo/paths.py | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/rigo/debug_rigo.sh b/rigo/debug_rigo.sh index 59cd07bf0..42e311609 100755 --- a/rigo/debug_rigo.sh +++ b/rigo/debug_rigo.sh @@ -1,4 +1,6 @@ #!/bin/sh +export RIGO_DATA_DIR="./data" +export RIGO_ICON_PATH="./data/icons" # GDB? # exec gdb --args python rigo_app.py # --dumper --debug exec python rigo_app.py --dumper --debug diff --git a/rigo/rigo/paths.py b/rigo/rigo/paths.py index 1d348eca8..a1e6a57ba 100644 --- a/rigo/rigo/paths.py +++ b/rigo/rigo/paths.py @@ -22,15 +22,7 @@ import os import tempfile ICON_PATH = os.getenv("RIGO_ICON_PATH", "/usr/share/rigo/icons") -_local_icon_path = "./data/icons" -if os.path.isdir(_local_icon_path): - ICON_PATH = _local_icon_path - DATA_DIR = os.getenv("RIGO_DATA_DIR", "/usr/share/rigo") -_local_data_dir = "./data" -if os.path.isdir(_local_data_dir): - DATA_DIR = _local_data_dir - _home_dir = os.getenv("HOME") if _home_dir is None: