From be8c22286444147f218a171f8714d5b0c71d70e8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 2 Jan 2015 22:54:33 +0530 Subject: [PATCH] Fix regression in 2.15 that broke calibre on OS X 10.7. Fixes #1407102 [Calibre 2.15 doesn't work in my mac](https://bugs.launchpad.net/calibre/+bug/1407102) --- setup/installer/osx/app/site.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup/installer/osx/app/site.py b/setup/installer/osx/app/site.py index f38fe6cf77..d68aa650c1 100644 --- a/setup/installer/osx/app/site.py +++ b/setup/installer/osx/app/site.py @@ -192,6 +192,12 @@ def main(): except: pass # Failure to log to Console.app is not critical + # Needed on OS X 10.7, which passes -psn_... as a command line arg when + # starting via launch services + for arg in tuple(sys.argv[1:]): + if arg.startswith('-psn_'): + sys.argv.remove(arg) + base = sys.resourcepath sys.frozen = 'macosx_app' sys.new_app_bundle = True