Now saving market URLs in the error bundle (bug 812624)

mattbasta · Jan 18, 2013 · f50f536 · f50f536
1 parent fd6d883
commit f50f536
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/appvalidator/specs/webapps.py b/appvalidator/specs/webapps.py
@@ -319,7 +319,8 @@ def process_iaf(self, node):
                                  "`https://` to correct this issue.",
                                  "Found: %s" % item,
                                  self.MORE_INFO])
-            elif item == "*" or item in constants.DEFAULT_WEBAPP_MRKT_URLS:
+            elif item == "*" or item in (self.err.get_resource("market_urls") or
+                                         constants.DEFAULT_WEBAPP_MRKT_URLS):
                 market_urls.add(item)
 
         if self.err.get_resource("listed") and not market_urls:

diff --git a/appvalidator/validate.py b/appvalidator/validate.py
@@ -27,7 +27,7 @@ def validate_app(data, listed=True, market_urls=None):
     bundle = ErrorBundle(listed=listed)
 
     # Set the market URLs.
-    set_market_urls(market_urls)
+    bundle.save_resource("market_urls", market_urls)
 
     webapp.detect_webapp_string(bundle, data)
     return format_result(bundle, "json")
@@ -60,7 +60,7 @@ def validate_packaged_app(path, listed=True, format="json", market_urls=None,
     bundle.save_resource("packaged", True)
 
     # Set the market URLs.
-    set_market_urls(market_urls)
+    bundle.save_resource("market_urls", market_urls)
 
     submain.prepare_package(bundle, path, timeout)
     return format_result(bundle, format)
@@ -73,9 +73,3 @@ def format_result(bundle, format):
         return formats[format](bundle)
     else:
         return bundle
-
-
-def set_market_urls(market_urls=None):
-    if market_urls is not None:
-        constants.DEFAULT_WEBAPP_MRKT_URLS = market_urls
-