From 4ccb35c4f3d01c590735b3957b71839916c28b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 16 Nov 2015 06:40:41 +0100 Subject: Refresh and rename patches --- 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 6cf704e..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: trunk/engine/SCons/Tool/JavaCommon.py -=================================================================== ---- trunk.orig/engine/SCons/Tool/JavaCommon.py -+++ trunk/engine/SCons/Tool/JavaCommon.py -@@ -283,7 +283,10 @@ if java_parsing: - 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