Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / yang / embedmodel.py

diff --git a/yang/embedmodel.py b/yang/embedmodel.py
index 39bf2bb9226c1a3fb3edf95b0977ced8285727d0..6d37839cf36ea660a189cfb5be239a776797c975 100644 (file)
--- a/yang/embedmodel.py
+++ b/yang/embedmodel.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# SPDX-License-Identifier: NONE
 #
 # YANG module to C wrapper
 # written 2018 by David Lamparter, placed in Public Domain.
@@ -12,8 +13,10 @@ inname = sys.argv[1]
 outname = sys.argv[2]
 
 outdir = os.path.dirname(os.path.abspath(outname))
-if not os.path.isdir(outdir):
+try:
     os.makedirs(outdir)
+except FileExistsError:
+    pass
 
 # these are regexes to avoid a compile-time/host dependency on yang-tools
 # or python-yang.  Cross-compiling FRR is already somewhat involved, no need
@@ -94,7 +97,7 @@ else:
         sub_name = search_name.group(1)
         name = re_mainname.search(data).group(1)
         sub_rev = re_rev.search(data).group(1)
-    fmt = "LYS_YANG"
+    fmt = "LYS_IN_YANG"
 
 if name is None or rev is None:
     raise ValueError("cannot determine YANG module name and revision")