diff --git a/.travis.yml b/.travis.yml index 03f45ec8..8ff13988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,6 @@ addons: install: - python setup.py install script: + - python checkdeps.py - pybitmessage -t - python setup.py test diff --git a/README.md b/README.md index 5dfe24df..c3dcb540 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ pseudo-mailing list: BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh Feel welcome to join chan "bitmessage", BM-2cWy7cvHoq3f1rYMerRJp8PT653jjSuEdY -which is on preview here: http://beamstat.com/chan/bitmessage +which is on preview here: https://beamstat.com/chan/bitmessage References ---------- diff --git a/checkdeps.py b/checkdeps.py index f261c924..28b1e559 100755 --- a/checkdeps.py +++ b/checkdeps.py @@ -11,6 +11,7 @@ Limitations: """ import os +import sys from distutils.errors import CompileError try: from setuptools.dist import Distribution @@ -161,5 +162,7 @@ if (not compiler or prereqs) and OPSYS in PACKAGE_MANAGER: if not compiler: compilerToPackages() prereqToPackages() + if mandatory: + sys.exit(1) else: print("All the dependencies satisfied, you can install PyBitmessage") diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index c6e01c39..e800877b 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2811,6 +2811,19 @@ class MyForm(settingsmixin.SMainWindow): def network_switch(self): dontconnect_option = not BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect') + reply = QtGui.QMessageBox.question( + self, _translate("MainWindow", "Disconnecting") + if dontconnect_option else _translate("MainWindow", "Connecting"), + _translate( + "MainWindow", + "Bitmessage will now drop all connectins. Are you sure?" + ) if dontconnect_option else _translate( + "MainWindow", + "Bitmessage will now start connecting to network. Are you sure?" + ), QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel, + QtGui.QMessageBox.Cancel) + if reply != QtGui.QMessageBox.Yes: + return BMConfigParser().set( 'bitmessagesettings', 'dontconnect', str(dontconnect_option)) BMConfigParser().save() diff --git a/src/depends.py b/src/depends.py index 06150642..39f5e759 100755 --- a/src/depends.py +++ b/src/depends.py @@ -137,7 +137,7 @@ def detectOSRelease(): for line in osRelease: if line.startswith("NAME="): detectOS.result = OS_RELEASE.get( - line.split("=")[-1].strip().lower()) + line.replace('"', '').split("=")[-1].strip().lower()) elif line.startswith("VERSION_ID="): try: version = float(line.split("=")[1].replace("\"", ""))