Delete unnecessary fix_db2_mac make target (Yelp#254)

Author: justineyster

Diff for: .travis.yml

@@ -53,6 +53,7 @@ install:
     - pip install tox
 # normal script supports multiple line syntax
 script: |
+      set -e
       make test
       ./build-dockerfiles.sh
 

Diff for: Makefile

@@ -24,13 +24,3 @@ clean:
 super-clean: clean
 	rm -rf .tox
 	rm -rf venv
-
-.PHONY: fix-db2-mac
-fix-db2-mac:
-	# comment out lines for any interpreters that aren't installed on your machine
-	install_name_tool -change libdb2.dylib $(PROJECT_DIR)/.tox/py27/lib/python2.7/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/py27/lib/python2.7/site-packages/ibm_db.so
-	install_name_tool -change libbd2.dylib $(PROJECT_DIR)/.tox/py35/lib/python3.5/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/py35/lib/python3.5/site-packages/ibm_db.cpython-35m-darwin.so
-	install_name_tool -change libbd2.dylib $(PROJECT_DIR)/.tox/py36/lib/python3.6/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/py36/lib/python3.6/site-packages/ibm_db.cpython-36m-darwin.so
-	install_name_tool -change libdb2.dylib $(PROJECT_DIR)/.tox/py37/lib/python3.7/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/py37/lib/python3.7/site-packages/ibm_db.cpython-37m-darwin.so
-	install_name_tool -change libdb2.dylib $(PROJECT_DIR)/.tox/pypy/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/pypy/site-packages/ibm_db.pypy-41.so
-	install_name_tool -change libdb2.dylib $(PROJECT_DIR)/.tox/pypy3/site-packages/clidriver/lib/libdb2.dylib $(PROJECT_DIR)/.tox/pypy3/site-packages/ibm_db.pypy3-71-darwin.so

Diff for: detect_secrets/main.py

@@ -11,6 +11,13 @@
 from detect_secrets.util import build_automaton
 
 
+try:
+    FileNotFoundError
+except NameError:  # pragma: no cover
+    # support python 2.x
+    FileNotFoundError = IOError
+
+
 def parse_args(argv):
     return ParserBuilder()\
         .add_console_use_arguments()\
@@ -198,9 +205,15 @@ def _get_existing_baseline(import_filename):
     if import_filename:
         try:
             return _read_from_file(import_filename[0])
-        except FileNotFoundError:
-            # create new baseline if not existed
-            return None
+        except FileNotFoundError as fnf_error:
+            if fnf_error.errno == 2:  # create new baseline if not existed
+                return None
+            else:  # throw exception for other cases
+                print(
+                    'Error reading from existing baseline ' + import_filename[0],
+                    file=sys.stderr,
+                )
+                raise fnf_error
     if not sys.stdin.isatty():
         stdin = sys.stdin.read().strip()
         if stdin:

Diff for: tests/main_test.py

@@ -16,6 +16,13 @@
 from testing.util import wrap_detect_secrets_main
 
 
+try:
+    FileNotFoundError
+except NameError:  # pragma: no cover
+    # support python 2.x
+    FileNotFoundError = IOError
+
+
 def get_list_of_plugins(include=None, exclude=None):
     """
     :type include: List[Dict[str, Any]]
@@ -258,9 +265,11 @@ def test_reads_non_existed_baseline_from_file(
         mock_merge_baseline,
         mock_baseline_initialize,
     ):
+        fnf_error = FileNotFoundError()
+        fnf_error.errno = 2
         with mock_stdin(), mock.patch(
             'detect_secrets.main._read_from_file',
-            side_effect=FileNotFoundError,
+            side_effect=fnf_error,
         ) as m_read, mock.patch(
             'detect_secrets.main.write_baseline_to_file',
         ) as m_write:
@@ -282,6 +291,18 @@ def test_reads_non_existed_baseline_from_file(
         )
         mock_merge_baseline.assert_not_called()
 
+    def test_reads_baseline_from_file_with_other_ioerror(
+        self,
+    ):
+        io_error = IOError()
+        with mock_stdin(), mock.patch(
+            'detect_secrets.main._read_from_file',
+            side_effect=io_error,
+        ) as m_read:
+            with pytest.raises(IOError):
+                main('scan --update non_existed_baseline_file'.split()) == 0
+            assert m_read.call_args[0][0] == 'non_existed_baseline_file'
+
     @pytest.mark.parametrize(
         'exclude_files_arg, expected_regex',
         [