validate:launcher: skip default media path for --media-paths option

when --media-paths is specified, then no need to check the default media.
And add Force argument to let testsuite force the inclusion of
default media directory.

https://bugzilla.gnome.org/show_bug.cgi?id=752461

1 files changed, 4 insertions, 2 deletions

diff --git a/validate/launcher/main.py b/validate/launcher/main.py
index afcb1e7..b6efe6f 100644
--- a/validate/launcher/main.py
+++ b/validate/launcher/main.py
@@ -294,7 +294,10 @@ class LauncherConfig(Loggable):
 
         self.http_server_dir = path
 
-    def add_paths(self, paths):
+    def add_paths(self, paths, force=False):
+        if force is False:
+            if self.paths:
+                return
         if not isinstance(paths, list):
             paths = [paths]
 
@@ -302,7 +305,6 @@ class LauncherConfig(Loggable):
             self.paths = paths
             self._using_default_paths = False
         else:
-
             for path in paths:
                 if path not in self.paths:
                     self.paths.append(path)