components/python/python27/patches/20-bsddb-harmful.patch
changeset 1914 00e8dbcb9b1e
child 1954 32663e59626d
equal deleted inserted replaced
1913:bf893655bc39 1914:00e8dbcb9b1e
       
     1 Prior to 2.7.4, the bsddb module was a no-op, as it did not get built.
       
     2 Starting with 2.7.4, the behavior is different, and it causes tests to
       
     3 dump core.  So skip it.  The module is removed in Python 3, so this patch
       
     4 is not being submitted upstream.
       
     5 
       
     6 --- Python-2.7.6/Makefile.pre.in.~4~	2014-05-14 16:20:56.889089787 -0700
       
     7 +++ Python-2.7.6/Makefile.pre.in	2014-05-14 16:21:12.651500578 -0700
       
     8 @@ -972,7 +972,7 @@
       
     9  		email email/mime email/test email/test/data \
       
    10  		json json/tests \
       
    11  		sqlite3 sqlite3/test \
       
    12 -		logging bsddb bsddb/test csv importlib wsgiref \
       
    13 +		logging csv importlib wsgiref \
       
    14  		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
       
    15  		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
       
    16  		ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
       
    17 --- Python-2.7.6/setup.py.~6~	2014-05-14 17:15:45.315760008 -0700
       
    18 +++ Python-2.7.6/setup.py	2014-05-14 17:16:27.440642039 -0700
       
    19 @@ -1065,7 +1065,8 @@
       
    20                                      db_dirs_to_check + lib_dirs, dblib )
       
    21                      if dblib_file:
       
    22                          dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
       
    23 -                        raise db_found
       
    24 +                        # Doesn't work; skip.
       
    25 +                        # raise db_found
       
    26                      else:
       
    27                          if db_setup_debug: print "db lib: ", dblib, "not found"
       
    28