diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:02:04 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-08-25 15:02:04 +0200 |
commit | 83370576d74c932cde854cb251bfff6b06ab45ec (patch) | |
tree | 71a48f93597a9b5972dd42ca5bd07eeaf3747488 /debian/patches/java_ignore_nonexistent_files.patch | |
parent | 99469e37d07b9f326c5b2c8157566f2f512cdc56 (diff) |
last 2.3.2-1
Diffstat (limited to 'debian/patches/java_ignore_nonexistent_files.patch')
-rw-r--r-- | debian/patches/java_ignore_nonexistent_files.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..5ba4713 --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files.patch @@ -0,0 +1,21 @@ +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, |