generate-mirror-commands: get_clone_commands: fix skipped repositories

drm-hwcomposer/drm-hwcomposer is supposed to be skipped as
we have the following code:
    def is_revision_blacklisted(self, elm):
        [...]
        if revision == 'master':
            return True
        [...]
        elif remote == 'freedesktop':
            return True

        return False

But instead, when running the following command:
    generate-mirror-commands.py  ../default.xml'
we have a crash (the file paths were shortened in the crash
below):
    # drm-hwcomposer/drm-hwcomposer
    Traceback (most recent call last):
      File "generate-mirror-commands.py", line 201, in <module>
        manifest.parse()
      File "generate-mirror-commands.py", line 187, in parse
        for command in self.get_clone_commands(child):
      File "generate-mirror-commands.py", line 145, in get_clone_commands
        base_directory = self.get_base_directory(remote)
      File "generate-mirror-commands.py", line 109, in get_base_directory
        assert(given_remote.get('name') in whitelist)
    AssertionError

This is because generate-mirror-commands tries to lookup the mirror
directory (dirname) before checking if the repository needs to be
skipped.

And when we don't want to mirror a given repository (for instance
because it uses the mater branch), we will want to skip it (at least
for now) but we might not have any directory in which we want to
store the mirror.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/generate-mirror-commands.py b/scripts/generate-mirror-commands.py
index 0ec2151..b82899c 100755
--- a/scripts/generate-mirror-commands.py
+++ b/scripts/generate-mirror-commands.py
@@ -140,8 +140,10 @@ class Manifest(object):
         return False
 
     def get_clone_commands(self, elm):
-        commands = []
+        if self.is_revision_blacklisted(elm):
+            return []
 
+        commands = []
         url = self.get_clone_url(elm)
         remote = self.get_remote(self.get_project_property(elm, 'remote'))
         base_directory = self.get_base_directory(remote)
@@ -162,8 +164,6 @@ class Manifest(object):
             print('    or to the blacklist in {}'.format(
                 'is_revision_blacklisted'))
             assert(False)
-        elif self.is_revision_blacklisted(elm):
-            return []
 
         commands.append("if [ ! -d {}/{}.git ] ; then".format(
             base_directory, repo_directory))