topotato: temporarily accept more sysconfdir values

Adapting to FRRouting#15243 upstream FRR. Signed-off-by: David Lamparter <[email protected]>
opensourcerouting · Apr 25, 2024 · 671fd98 · 671fd98
1 parent 072302d
commit 671fd98
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/topotato/frr/core.py b/topotato/frr/core.py
@@ -210,10 +210,17 @@ def _env_check(self, result: EnvcheckResult):
         except KeyError as e:
             result.error("FRR configured to use a non-existing user (%r)" % e)
 
-        if self.makevars["sysconfdir"] != self.confpath:
+        if self.makevars["sysconfdir"] not in (
+            self.confpath,
+            os.path.dirname(self.confpath),
+        ):
             result.error(
-                "FRR configured with --sysconfdir=%r, must be %r for topotato"
-                % (self.makevars["sysconfdir"], self.confpath)
+                "FRR configured with --sysconfdir=%r, must be %r or %r for topotato"
+                % (
+                    self.makevars["sysconfdir"],
+                    self.confpath,
+                    os.path.dirname(self.confpath),
+                )
             )
         if not os.path.isdir(self.confpath):
             result.error(