From: Elan Ruusamäe Date: Sun, 23 Dec 2012 18:26:11 +0000 (+0200) Subject: code style X-Git-Tag: auto/th/caja-dropbox-1.7.90-1~4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcaja-dropbox.git;a=commitdiff_plain;h=c05614c18af4a1c8a28400799533d75f3ae6476f code style --- diff --git a/dropboxd-path.patch b/dropboxd-path.patch index f39a0ed..b9098a2 100644 --- a/dropboxd-path.patch +++ b/dropboxd-path.patch @@ -5,10 +5,10 @@ def start_dropbox(): - db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding()) -+ # first try dropboxd from system, fallback to user install ++ # first try dropboxd from system, fallback to user install + db_path = "/usr/bin/dropboxd" + if not os.access(db_path, os.X_OK): -+ db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding()) ++ db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding()) if os.access(db_path, os.X_OK): f = open("/dev/null", "w") # we don't reap the child because we're gonna die anyway, let init do it