unarchive: fix bug blocking 'locale' folder

- Update the 'local' folder detection to avoid thinking that 'locale' was a 'local' folder. Whoops.
Kintyre · Apr 9, 2020 · 0336ae4 · 0336ae4
1 parent e90fddf
commit 0336ae4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -8,6 +8,12 @@ Ksconf 0.7.x
 
 New functionality, massive documentation improvements, metadata support, and Splunk app install fixes.
 
+Release v0.7.8 (DRAFT)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-   Fixed bug in the ``unarchive`` command where a ``locale`` folder was blocked as a ``local`` folder.
+
+
 Release v0.7.7 (2020-03-05)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/ksconf/commands/unarchive.py b/ksconf/commands/unarchive.py
@@ -133,7 +133,8 @@ def run(self, args):
                 conffile.name = os.path.join(args.tarball, gaf.path)
                 app_conf = parse_conf(conffile, profile=PARSECONF_LOOSE)
                 del conffile
-            elif gaf_relpath.startswith("local") or gaf_relpath.endswith("local.meta"):
+            elif gaf_relpath.startswith("local" + os.path.sep) or \
+                 gaf_relpath.endswith("local.meta"):
                 local_files.add(gaf_relpath)
             app_name.add(gaf.path.split("/", 1)[0])
             del gaf_app, gaf_relpath