~ubuntu-branches/ubuntu/saucy/nautilus-dropbox/saucy

« back to all changes in this revision

Viewing changes to debian/patches/do-not-hardcode-dropboxd-path.patch

  • Committer: Package Import Robot
  • Author(s): Raphaël Hertzog
  • Date: 2011-12-28 11:35:56 UTC
  • mfrom: (7.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20111228113556-d2xamk9cqa1v6psb
Tags: 0.7.1-2
* Update watch file to cope with changes on the dropbox website.
* Update copyright file to fix 2 syntax errors and to add a disclaimer
  concerning the fact that the package is in non-free. Thanks
  to Charles Plessy for the patch. Closes: #650735
* Split upstreamable changes from use-var-lib-dropbox.patch into
  do-not-hardcode-dropboxd-path.patch.
* Split non-upstream changes from dropbox-update.patch into
  non-interactive-update.patch.
* Update use-var-lib-dropbox.patch to ensure that the extracted files are
  owned by root.
* Stop dropbox in the prerm and not in the postrm since the program
  is no longer available at that point.
* New patch add-http-proxy-option.patch to force the http_proxy environment
  variable.
* Update use-pkexec-to-get-root-rights.patch to forward the http_proxy
  environment variable across pkexec. Closes: #651065

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Use DROPBOXD_PATH instead of hardcoding ~/.dropbox-dist/dropboxd
 
2
Author: Raphaël Hertzog <hertzog@debian.org>
 
3
Origin: vendor
 
4
 
 
5
--- a/dropbox.in
 
6
+++ b/dropbox.in
 
7
@@ -702,7 +702,7 @@ def requires_dropbox_running(meth):
 
8
     return newmeth
 
9
 
 
10
 def start_dropbox():
 
11
-    db_path = os.path.expanduser(u"~/.dropbox-dist/dropboxd").encode(sys.getfilesystemencoding())
 
12
+    db_path = os.path.expanduser(DROPBOXD_PATH).encode(sys.getfilesystemencoding())
 
13
     if os.access(db_path, os.X_OK):
 
14
         f = open("/dev/null", "w")
 
15
         # we don't reap the child because we're gonna die anyway, let init do it