mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 04:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tabs

Browse Source
This commit is contained in:
Nate
2012-05-21 14:38:31 -04:00
parent ad7a690572
commit 3156ac77c2
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+14 -14
View File
@@ -2356,28 +2356,28 @@ def getPrimaryManifest(alternate_id):
manifest = getmanifest(manifesturl + clientidentifier,
suppress_errors=True)
if not manifest:
# try the short hostname
# try the short hostname
clientidentifier = hostname.split('.')[0]
munkicommon.display_detail('Request failed. Trying %s...' %
clientidentifier)
manifest = getmanifest(manifesturl + clientidentifier,
suppress_errors=True)
if not manifest:
# try the machine serial number
clientidentifier = MACHINE['serial_number']
if clientidentifier != 'UNKNOWN':
munkicommon.display_detail('Request failed. Trying %s...' %
# try the machine serial number
clientidentifier = MACHINE['serial_number']
if clientidentifier != 'UNKNOWN':
munkicommon.display_detail('Request failed. Trying %s...' %
clientidentifier)
manifest = getmanifest(manifesturl + clientidentifier,
suppress_errors=True)
elif not manifest:
# last resort - try for the site_default manifest
clientidentifier = 'site_default'
munkicommon.display_detail('Request failed. ' +
'Trying %s...' %
clientidentifier)
manifest = getmanifest(manifesturl + clientidentifier,
suppress_errors=True)
elif not manifest:
# last resort - try for the site_default manifest
clientidentifier = 'site_default'
munkicommon.display_detail('Request failed. ' +
'Trying %s...' %
clientidentifier)
if not manifest:
if not manifest:
manifest = getmanifest(
manifesturl + urllib2.quote(clientidentifier.encode('utf-8')))
if manifest: