diff options
| author | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:47 +0200 |
| commit | 7c6b954c00c2a2eed2e975ec797216c515cd249d (patch) | |
| tree | 475c0ae1b3b3b8be085b54420894896688ea363c /debian/patches/java_ignore_nonexistent_files.patch | |
| parent | 2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff) | |
Imported Upstream version 2.3.2upstream/2.3.2
Diffstat (limited to 'debian/patches/java_ignore_nonexistent_files.patch')
| -rw-r--r-- | debian/patches/java_ignore_nonexistent_files.patch | 21 |
1 files changed, 0 insertions, 21 deletions
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, |