Merge remote branch 'upstream/master'

mozilla · Apr 13, 2011 · 8489f02 · 8489f02
2 parents 62d2710 + 49363bb
commit 8489f02
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/python-lib/cuddlefish/__init__.py b/python-lib/cuddlefish/__init__.py
@@ -294,6 +294,8 @@ def test_cfx(env_root, verbose):
     os.chdir(env_root)
     retval = cuddlefish.tests.run(verbose)
     os.chdir(olddir)
+    # tests write to stderr. flush everything now to avoid confusion later.
+    sys.stdout.flush(); sys.stderr.flush()
     return retval
 
 def test_all_examples(env_root, defaults):

diff --git a/python-lib/cuddlefish/app-extension/install.rdf b/python-lib/cuddlefish/app-extension/install.rdf
@@ -9,19 +9,12 @@
     <em:bootstrap>true</em:bootstrap>
     <em:unpack>true</em:unpack>
 
-    <!-- Target Application this extension can install into, 
-         with minimum and maximum supported versions. For a list 
-         of valid values, see:
-
-         https://addons.mozilla.org/en-US/firefox/pages/appversions
-     --> 
-
     <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>4.0b7</em:minVersion>
-        <em:maxVersion>4.2a1pre</em:maxVersion>
+        <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>