Skip to content

Commit 1eb18c6

Browse files
samertmraveit65
authored andcommitted
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: dropbox/nautilus-dropbox@64f6412
1 parent 527b9cc commit 1eb18c6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

caja-dropbox.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ try:
4444
gpgme = None
4545
except ImportError:
4646
gpg = None
47-
# Still support gpgme for now. Remove this once we only support 17.10+.
47+
# Still support gpgme for now. Remove this once we only support 17.04+.
4848
try:
4949
import gpgme
5050
except ImportError:
@@ -56,10 +56,10 @@ from posixpath import curdir, sep, pardir, join, abspath, commonprefix
5656
INFO = u"Dropbox is the easiest way to share and store your files online. Want to learn more? Head to"
5757
LINK = u"https://www.dropbox.com/"
5858
WARNING = u"In order to use Dropbox, you must download the proprietary daemon."
59-
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."
59+
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."
6060
ERROR_CONNECTING = u"Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable."
6161
ERROR_SIGNATURE = u"Downloaded binary does not match Dropbox signature, aborting install."
62-
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"
62+
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"
6363

6464
DOWNLOAD_LOCATION_FMT = "https://www.dropbox.com/download?plat=%s"
6565
SIGNATURE_LOCATION_FMT = "https://www.dropbox.com/download?plat=%s&signature=1"
@@ -611,6 +611,7 @@ else:
611611
break
612612
setprogress(DOWNLOADING, progress)
613613
except Exception:
614+
traceback.print_exc()
614615
FatalVisibleError(ERROR_CONNECTING)
615616
else:
616617
setprogress(DOWNLOADING, 1.0)
@@ -621,8 +622,10 @@ else:
621622
for name, i, total in download.unpack():
622623
setprogress(UNPACKING, float(i)/total)
623624
except SignatureVerifyError:
625+
traceback.print_exc()
624626
FatalVisibleError(ERROR_SIGNATURE)
625627
except Exception:
628+
traceback.print_exc()
626629
FatalVisibleError(ERROR_CONNECTING)
627630
else:
628631
setprogress(UNPACKING, 1.0)

0 commit comments

Comments
 (0)