From 9301412f90b0b3c9aef391268c4ba650fa1b1611 Mon Sep 17 00:00:00 2001
From: Caleb Connolly <kc@postmarketos.org>
Date: Tue, 11 Jul 2023 18:09:33 +0100
Subject: [PATCH] pmb.helpers: remove check for old device paths (MR 2252)

The migration to the new pmaports device layout was 3 years ago, I think
it's reasonable that this check is no longer needed.
---
 pmb/__init__.py      |  2 --
 pmb/helpers/other.py | 15 ---------------
 2 files changed, 17 deletions(-)

diff --git a/pmb/__init__.py b/pmb/__init__.py
index 45576e20..3da30cfe 100644
--- a/pmb/__init__.py
+++ b/pmb/__init__.py
@@ -66,8 +66,6 @@ def main():
             raise RuntimeError("Work path not found, please run 'pmbootstrap"
                                " init' to create it.")
 
-        other.check_old_devices(args)
-
         # Migrate work folder if necessary
         if args.action not in ["shutdown", "zap", "log"]:
             other.migrate_work_folder(args)
diff --git a/pmb/helpers/other.py b/pmb/helpers/other.py
index fc016128..3e3b9547 100644
--- a/pmb/helpers/other.py
+++ b/pmb/helpers/other.py
@@ -242,21 +242,6 @@ def migrate_work_folder(args: PmbArgs):
                            " be lost.")
 
 
-def check_old_devices(args):
-    """Check if there are any device ports in device/\\*/APKBUILD.
-
-    Devices should be in device/\\*/\\*/APKBUILD (e.g. device/testing/...).
-    """
-    g = glob.glob(args.aports + "/device/*/APKBUILD")
-    if not g:
-        return
-
-    raise RuntimeError("Found device ports outside device/testing/... "
-                       "Please run 'pmbootstrap pull' and/or move the "
-                       "following device ports to device/testing:\n - " +
-                       '\n - '.join(g))
-
-
 def validate_hostname(hostname):
     """Check whether the string is a valid hostname.