mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-08 00:00:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #473 from dayglojesus/make_makecatalogs_follow_symlinks

Browse Source 
follow symlinks when walking pkgs and pkgsinfo
This commit is contained in:
Greg Neagle
2015-05-01 11:16:42 -07:00
parent 6e977c74ec ee1bcac831
commit f476988816
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/client/makecatalogs
View File

@@ -167,7 +167,7 @@ def makecatalogs(repopath, options):
catalogs['all'] = []
# Walk through the pkginfo files
for dirpath, dirnames, filenames in os.walk(pkgsinfopath):
for dirpath, dirnames, filenames in os.walk(pkgsinfopath, followlinks=True):
for dirname in dirnames:
# don't recurse into directories that start
# with a period.
@@ -234,7 +234,7 @@ def makecatalogs(repopath, options):
do_pkg_check = False
if pkginfo.get('PackageURL'):
do_pkg_check = False
if do_pkg_check:
if not 'installer_item_location' in pkginfo: