From 90446f0632e546759644f0b8e4e458df4be7e1e8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 30 Apr 2010 07:47:34 -0600 Subject: [PATCH] Fix #5417 (Indication that in development environment) --- setup/installer/linux/freeze.py | 2 +- src/calibre/gui2/ui.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/installer/linux/freeze.py b/setup/installer/linux/freeze.py index d452911dd0..7353134393 100644 --- a/setup/installer/linux/freeze.py +++ b/setup/installer/linux/freeze.py @@ -153,7 +153,7 @@ class LinuxFreeze(Command): sys.resources_location = os.path.join(DIR_NAME, 'resources') dfv = os.environ.get('CALIBRE_DEVELOP_FROM', None) if dfv and os.path.exists(dfv): - sys.path.insert(0, dfv) + sys.path.insert(0, os.path.abspath(dfv)) executables = %(executables)s diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index c1e9da8b74..64004c70f8 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -242,8 +242,12 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): ####################### Vanity ######################## self.vanity_template = _('

For help see the: User Manual' '
')%'http://calibre-ebook.com/user_manual' + dv = os.environ.get('CALIBRE_DEVELOP_FROM', None) + v = __version__ + if getattr(sys, 'frozen', False) and dv and os.path.abspath(dv) in sys.path: + v += '*' self.vanity_template += _('%s: %s by Kovid Goyal ' - '%%(version)s
%%(device)s

')%(__appname__, __version__) + '%%(version)s
%%(device)s

')%(__appname__, v) self.latest_version = ' ' self.vanity.setText(self.vanity_template%dict(version=' ', device=' ')) self.device_info = ' '