mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-25 16:39:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Extra caution to always default to FileRepo if plugin value is None or ''

Browse Source
This commit is contained in:
Greg Neagle
2017-03-10 12:16:37 -08:00
parent c1a345b1ad
commit 60bea033cf
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/client/iconimporter
View File

@@ -284,7 +284,7 @@ def main():
# Make sure the repo exists
try:
repo = munkirepo.connect(options.repo_url, options.plugin)
repo = munkirepo.connect(options.repo_url, options.plugin or 'FileRepo')
except munkirepo.RepoError, err:
print_err_utf8(u'Could not connect to munki repo: %s' % unicode(err))
exit(-1)

2
code/client/makecatalogs
View File

@@ -394,7 +394,7 @@ def main():
# Connect to the repo
try:
repo = munkirepo.connect(options.repo_url, options.plugin)
repo = munkirepo.connect(options.repo_url, options.plugin or 'FileRepo')
except munkirepo.RepoError, err:
print >> sys.stderr, (u'Could not connect to munki repo: %s'
% unicode(err))

2
code/client/munkiimport
View File

@@ -915,7 +915,7 @@ def main():
exit(-1)
try:
repo = munkirepo.connect(REPO_URL, REPO_PLUGIN)
repo = munkirepo.connect(REPO_URL, REPO_PLUGIN or 'FileRepo')
except munkirepo.RepoError, err:
print >> sys.stderr, (u'Could not connect to munki repo: %s'
% unicode(err))