[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8224/8267] runqemu: Ensure we process all tap devices

[Emmanuele Bassi <ebassi src gnome org>]

commit 65d09a7d1e8bbb0867a1002d810e085f49fd76b1
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Nov 20 20:55:34 2017 +0000

    runqemu: Ensure we process all tap devices
    
    The regexp in the script misses some tap devices, e.g. we see output like:
    
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap25.lock failed: [Errno 11] Resource 
temporarily unavailable
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap26.lock failed: [Errno 11] Resource 
temporarily unavailable
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap27.lock failed: [Errno 11] Resource 
temporarily unavailable
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap28.lock failed: [Errno 11] Resource 
temporarily unavailable
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap40.lock failed: [Errno 11] Resource 
temporarily unavailable
    runqemu - INFO - Acquiring lockfile /tmp/qemu-tap-locks/tap41.lock failed: [Errno 11] Resource 
temporarily unavailable
    
    What happened to tap29 to tap39?
    
    The issue is was we were missing devices with '0' in the number,
    like "10:" and so on in the output from "ip link".
    
    (From OE-Core rev: ec1481f7ad6f2b3d1420027327510bec94dd66a8)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    (cherry picked from commit 6447697a48e3b693ee38806bc2ba07c2a65c2bc8)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 0558d1d..6ea370d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -923,7 +923,7 @@ class BaseConfig(object):
         logger.debug('Running %s...' % cmd)
         ip_link = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8')
         # Matches line like: 6: tap0: <foo>
-        possibles = re.findall('^[1-9]+: +(tap[0-9]+): <.*', ip_link, re.M)
+        possibles = re.findall('^[0-9]+: +(tap[0-9]+): <.*', ip_link, re.M)
         tap = ""
         for p in possibles:
             lockfile = os.path.join(lockdir, p)