From 7fed084bdaa11706008a6e0c4aaa5daf461f2c34 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Thu, 2 Aug 2007 17:52:35 +0000 Subject: [PATCH] install prefix touchup --- setup.py | 11 ----------- src/interface.py | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index e405392d7..82563c964 100644 --- a/setup.py +++ b/setup.py @@ -204,17 +204,6 @@ class write_data_install_path(cmd.Command): conf_file = open(conf_filename, 'w') conf_file.write(data) conf_file.close() - conf_filename = os.path.join(self.lib_build_dir, - 'deluge', 'interface.py') - - conf_file = open(conf_filename, 'r') - data = conf_file.read() - conf_file.close() - data = data.replace('@datadir@', self.prefix) - - conf_file = open(conf_filename, 'w') - conf_file.write(data) - conf_file.close() class unwrite_data_install_path(cmd.Command): description = 'undoes write_data_install_path' diff --git a/src/interface.py b/src/interface.py index eaf961f27..cbc2e3aab 100644 --- a/src/interface.py +++ b/src/interface.py @@ -48,7 +48,7 @@ import ipc_manager import plugins import tab_details import tab_files -INSTALL_PREFIX = '@datadir@' + class DelugeGTK: def __init__(self): self.ipc_manager = ipc_manager.Manager(self) @@ -123,7 +123,7 @@ class DelugeGTK: def new_release_check(): import os, sys py_version = sys.version[:3] - file = INSTALL_PREFIX + '/lib/python' + py_version + '/site-packages/deluge/update.py' + file = common.INSTALL_PREFIX + '/lib/python' + py_version + '/site-packages/deluge/update.py' os.spawnlp(os.P_NOWAIT, 'python', 'python', file, common.PROGRAM_VERSION) if self.config.get("new_releases"):