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

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

Browse Source
This commit is contained in:
Greg Neagle
2015-10-14 14:14:29 -07:00
parent 69c6398c6e cfd1fcb869
commit 422504e639
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+2 -2
View File
@@ -800,7 +800,7 @@ def download_installeritem(item_pl, installinfo, uninstalling=False):
location = item_pl.get(download_item_key)
if not location:
raise fetch.MunkiDownloadError(
"No %s in item info.", download_item_key)
"No %s in item info." % download_item_key)
# allow pkginfo preferences to override system munki preferences
downloadbaseurl = item_pl.get('PackageCompleteURL') or \
@@ -833,7 +833,7 @@ def download_installeritem(item_pl, installinfo, uninstalling=False):
if not enoughDiskSpace(item_pl, installinfo['managed_installs'],
uninstalling=uninstalling):
raise fetch.MunkiDownloadError(
'Insufficient disk space to download and install %s', pkgname)
'Insufficient disk space to download and install %s' % pkgname)
else:
munkicommon.display_detail(
'Downloading %s from %s', pkgname, location)