Merge pull request #20 from dmoody256/JarRemoveMagicNumbers

Jar remove magic numbers

2 files changed, 6 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6f1f2d0..40e1307 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,9 @@
 RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
 
   From Daniel Moody:
+    - Removed some magic numbers from jar.py on behalf of Mats Wichmann (mats@linux.com)
+
+  From Daniel Moody:
     - Jar can take multiple targets, and will make a duplicate jar from the sources for each target
     - Added some warnings in case the Jar builder makes an implicit target
     - Added Jar method and changed jar build to be more specific. Jar method will take in
diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 49600e0..f833ba2 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -52,7 +52,7 @@ def jarSources(target, source, env, for_signature):
     result = []
     for src in source:
         contents = src.get_text_contents()
-        if contents[:16] != "Manifest-Version":
+        if not contents.startswith("Manifest-Version"):
             if jarchdir_set:
                 _chdir = jarchdir
             else:
@@ -73,7 +73,7 @@ def jarManifest(target, source, env, for_signature):
     """Look in sources for a manifest file, if any."""
     for src in source:
         contents = src.get_text_contents()
-        if contents[:16] == "Manifest-Version":
+        if contents.startswith("Manifest-Version"):
             return src
     return ''
 
@@ -83,7 +83,7 @@ def jarFlags(target, source, env, for_signature):
     jarflags = env.subst('$JARFLAGS', target=target, source=source)
     for src in source:
         contents = src.get_text_contents()
-        if contents[:16] == "Manifest-Version":
+        if contents.startswith("Manifest-Version"):
             if not 'm' in jarflags:
                 return jarflags + 'm'
             break