mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-26 00:49:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix munkiimport to look in default install location for makecatalogs if makecatalogs is not found in same directory as munkiimport. Thanks to Heig Gregorian

Browse Source
This commit is contained in:
Greg Neagle
2012-04-27 10:23:45 -07:00
parent b5e9c4e607
commit 3fcf49ffc4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/client/munkiimport
View File

@@ -421,12 +421,12 @@ def makePkgInfo(item_path):
def makeCatalogs():
"""Calls makecatalogs to rebuild our catalogs"""
# first look for a makepkginfo in the same dir as us
# first look for a makecatalogs in the same dir as us
mydir = os.path.dirname(os.path.abspath(__file__))
makecatalogs_path = os.path.join(mydir, 'makecatalogs')
if not os.path.exists(makecatalogs_path):
# didn't find it; assume the default install path
makecatalogs_path = '/usr/local/munki/makepkginfo'
makecatalogs_path = '/usr/local/munki/makecatalogs'
repo_path = pref('repo_path')
if not repoAvailable():
raise RepoCopyError('Could not connect to munki repo.')