diff options
| author | Samer Masterson <[email protected]> | 2018-11-14 15:06:02 -0800 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-01-09 20:05:00 +0100 |
| commit | 1eb18c678771efdea91bc7d40e1be8e3699518a5 (patch) | |
| tree | cf0b64210d06beeb1042847674591fbb88ad5d58 | |
| parent | 527b9cc103ec07c8583904b6d6c97ad79f8be984 (diff) | |
| download | caja-dropbox-1eb18c678771efdea91bc7d40e1be8e3699518a5.tar.bz2 caja-dropbox-1eb18c678771efdea91bc7d40e1be8e3699518a5.tar.xz | |
small caja-dropbox.in fixes
- python-gpg was first included in 17.04, not 17.10. Update warning
to reflect that.
- Add more logging around error conditions.
origin commit:
https://github.com/dropbox/nautilus-dropbox/commit/64f6412
| -rwxr-xr-x | caja-dropbox.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/caja-dropbox.in b/caja-dropbox.in index d7b61bf..c96e7e3 100755 --- a/caja-dropbox.in +++ b/caja-dropbox.in @@ -44,7 +44,7 @@ try: gpgme = None except ImportError: gpg = None - # Still support gpgme for now. Remove this once we only support 17.10+. + # Still support gpgme for now. Remove this once we only support 17.04+. try: import gpgme except ImportError: @@ -56,10 +56,10 @@ from posixpath import curdir, sep, pardir, join, abspath, commonprefix INFO = u"Dropbox is the easiest way to share and store your files online. Want to learn more? Head to" LINK = u"https://www.dropbox.com/" WARNING = u"In order to use Dropbox, you must download the proprietary daemon." -GPG_WARNING = u"Note: python-gpg (python-gpgme for Ubuntu 17.04 and lower) is not installed, we will not be able to verify binary signatures." +GPG_WARNING = u"Note: python-gpg (python-gpgme for Ubuntu 16.10 and lower) is not installed, we will not be able to verify binary signatures." ERROR_CONNECTING = u"Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable." ERROR_SIGNATURE = u"Downloaded binary does not match Dropbox signature, aborting install." -ERROR_INVALID_DROPBOX = u"Could not run Dropbox. Make sure your computer meets the minimum requirements:\nhttps://www.dropbox.com/help/desktop-web/system-requirements#desktop" +ERROR_INVALID_DROPBOX = u"Could not start the Dropbox daemon. Make sure your computer meets the minimum requirements:\nhttps://www.dropbox.com/help/desktop-web/system-requirements#desktop" DOWNLOAD_LOCATION_FMT = "https://www.dropbox.com/download?plat=%s" SIGNATURE_LOCATION_FMT = "https://www.dropbox.com/download?plat=%s&signature=1" @@ -611,6 +611,7 @@ else: break setprogress(DOWNLOADING, progress) except Exception: + traceback.print_exc() FatalVisibleError(ERROR_CONNECTING) else: setprogress(DOWNLOADING, 1.0) @@ -621,8 +622,10 @@ else: for name, i, total in download.unpack(): setprogress(UNPACKING, float(i)/total) except SignatureVerifyError: + traceback.print_exc() FatalVisibleError(ERROR_SIGNATURE) except Exception: + traceback.print_exc() FatalVisibleError(ERROR_CONNECTING) else: setprogress(UNPACKING, 1.0) |