From 7c6b954c00c2a2eed2e975ec797216c515cd249d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Jul 2014 11:45:47 +0200 Subject: Imported Upstream version 2.3.2 --- debian/patches/java_ignore_nonexistent_files.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 debian/patches/java_ignore_nonexistent_files.patch (limited to 'debian/patches/java_ignore_nonexistent_files.patch') diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch deleted file mode 100644 index 5ba4713..0000000 --- a/debian/patches/java_ignore_nonexistent_files.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Ignore nonexistent files before trying to use them in Java() -Origin: Debian -Bug-Debian: http://bugs.debian.org/338232 -Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2207 - -Index: scons/engine/SCons/Tool/JavaCommon.py -=================================================================== ---- scons.orig/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:19:25.394200546 +0100 -+++ scons/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:28:01.158216345 +0100 -@@ -282,7 +282,10 @@ - return self.outer_state - - def parse_java_file(fn, version=default_java_version): -- return parse_java(open(fn, 'r').read(), version) -+ try: -+ return parse_java(open(fn, 'r').read(), version) -+ except IOError: -+ return (None, []) - - def parse_java(contents, version=default_java_version, trace=None): - """Parse a .java file and return a double of package directory, -- cgit v1.2.3