Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0384560c authored by Michael Gernoth's avatar Michael Gernoth
Browse files

roomservice: handle devices with underscores 

This change correctly handles devices with underscores in their
name even if there is a device with the same name after the last
underscore (spyder, umts_spyder) by not allowing any underscores
in the manufacturers name.

Without this change, spyder gets resolved to:
device/motorola_umts/spyder
device/motorola/spyder

Only the last one is valid.

With this change, both spyder and umts_spyder get resolved correctly.

Change-Id: I0c95ff126d827a2d6b58875dfcb9327e999f4913
parent 1b76af7a

tools/roomservice.py

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ if depsonly: 
else:

    for repository in repositories:

        repo_name = repository['name']

        if repo_name.startswith("android_device_") and repo_name.endswith("_" + device):

        if re.match(r"^android_device_[^_]*_" + device + "$", repo_name):

            print("Found repository: %s" % repository['name'])

            

            manufacturer = repo_name.replace("android_device_", "").replace("_" + device, "")