diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 06:40:41 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-16 06:40:41 +0100 |
| commit | 4ccb35c4f3d01c590735b3957b71839916c28b31 (patch) | |
| tree | bb40e7e524abe23f56463bea2824bc3c1aa6d747 /debian/patches/0105-java_ignore_nonexistent_files.patch | |
| parent | 60df8165e6be58369d76af4d38388c9846d82975 (diff) | |
Refresh and rename patches
Diffstat (limited to 'debian/patches/0105-java_ignore_nonexistent_files.patch')
| -rw-r--r-- | debian/patches/0105-java_ignore_nonexistent_files.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/0105-java_ignore_nonexistent_files.patch b/debian/patches/0105-java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..6cf704e --- /dev/null +++ b/debian/patches/0105-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: 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, |