Merge branch 'master' of https://github.com/munki/munki

Conflicts: code/client/makecatalogs
2026-05-05 11:59:18 -05:00 · 2015-01-23 11:34:56 -08:00
parent e4fb9cac47 a85a071745
commit 9f7a0598dc
1 changed files with 2 additions and 3 deletions
@@ -98,6 +98,7 @@ def makecatalogs(repopath, options):

    # start with no errors!
    errors = []
+    exit_code = 0

    # Make sure the icons directory exists
    iconspath = os.path.join(repopath, 'icons')
@@ -161,9 +162,7 @@ def makecatalogs(repopath, options):
        print_err_utf8("pkgsinfo path %s doesn't exist!" % pkgsinfopath)
        exit(-1)

-    # Set a default exit code
-    exit_code = 0
-
+    # start with empty catalogs dict
    catalogs = {}
    catalogs['all'] = []