mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-03-14 05:21:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,580 Commits 12 Branches 118 Tags
97ec890146dba12af0d17c2f75fb445b356235ed
Commit Graph

1499 Commits

Author SHA1 Message Date
Greg Neagle
97ec890146 Revert "Add missing 'import keychain' to fetch.py" 
This reverts commit 6644b958de.
 2014-06-16 15:35:15 -07:00
Greg Neagle
11173143c5 Revert "keychain.security now returns error output if stdout is empty. Needed to get output from 'security show-keychain-info'" 
This reverts commit e035aeb893.
 2014-06-16 15:35:10 -07:00
Greg Neagle
c86d9a536f Revert all NSURL commits. 
Revert "Move keychain location back into root's home dir"

This reverts commit 78b88bc10c.
 2014-06-16 15:34:22 -07:00
Greg Neagle
78b88bc10c Move keychain location back into root's home dir 2014-06-10 15:20:04 -07:00
Greg Neagle
e035aeb893 keychain.security now returns error output if stdout is empty. Needed to get output from 'security show-keychain-info' 2014-06-10 11:51:23 -07:00
Greg Neagle
6644b958de Add missing 'import keychain' to fetch.py 2014-06-10 11:29:58 -07:00
Greg Neagle
a2872b768f Display debugging information for keychain operations and SSL errors 2014-06-10 11:21:35 -07:00
Greg Neagle
6814c166e7 When adding a trusted cert, modify admin Trust Settings (instead of user) so that a GUI authentication dialog is not displayed. 2014-06-10 09:37:15 -07:00
Greg Neagle
6443a43952 Change all 'security' keychain references to use the full pathname 2014-06-10 08:15:36 -07:00
Greg Neagle
42b6c62aeb keychain module added to import existing certs/keys into a keychain for use by gurl 2014-06-10 06:34:51 -07:00
Greg Neagle
cf6c189bd9 Convert SSL error to string (from tuple) before displaying the error. 2014-06-09 12:06:56 -07:00
Greg Neagle
56c856e469 Initial stab at replacing curl with NSURLConnection and friends. 2014-06-09 11:50:45 -07:00
Greg Neagle
ada656f717 Adjust width of third item in Software/Categories list view to make certain OS versions lay out three items per line 2014-06-06 10:41:55 -07:00
Greg Neagle
4cb898fcef Undo execute bit added to several resources 2014-06-04 11:30:22 -07:00
Greg Neagle
bee4c2b934 Merge branch 'Munki2' of https://code.google.com/r/christophergrande-munkidev into Munki2 2014-06-04 11:22:58 -07:00
Greg Neagle
b37734b908 More error handling around custom resource maintenance 2014-06-04 10:10:08 -07:00
Justin McWilliams
80746ac975 In munkicommon.comparePlistVersion, protect against a plist parsing as NSCFString, not NSCFDictionary as expected, avoiding the following traceback: 
File "/usr/local/munki/managedsoftwareupdate", line 664, in main
   updatecheckresult = updatecheck.check(client_id=options.id)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2777, in check
   installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 2071, in processManifestForKey
   processOptionalInstall(item, cataloglist, installinfo)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1565, in processOptionalInstall
   iteminfo['installed'] = someVersionInstalled(item_pl)
 File "/usr/local/munki/munkilib/updatecheck.py", line 1281, in someVersionInstalled
   if compareItemVersion(item) == 0:
 File "/usr/local/munki/munkilib/updatecheck.py", line 645, in compareItemVersion
   return compareApplicationVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 400, in compareApplicationVersion
   return compareBundleVersion(app)
 File "/usr/local/munki/munkilib/updatecheck.py", line 517, in compareBundleVersion
   compare_result = comparePlistVersion(item)
 File "/usr/local/munki/munkilib/updatecheck.py", line 562, in comparePlistVersion
   installedvers = munkicommon.getVersionString(plist)
 File "/usr/local/munki/munkilib/munkicommon.py", line 1345, in getVersionString
   if plist.get(key):
  AttributeError: '__NSCFString' object has no attribute 'get'
 2014-05-30 15:01:19 -07:00
Greg Neagle
12e9af2724 Workaround for non-ASCII characters in version strings. 2014-05-30 14:55:44 -07:00
Christopher Grande
3dc7f5df61 CSS updates to tweak some alignment and padding: 
Vertical center on “Check Again” button under “Updates”
	Vertical center on “Remove” button under “My Items”
	Extra left padding on “No Pending Updates Text” under “Updates”
	Horizontal padding on Spinner under “Updates”
	Issue with barber poll gradient offset
	Artwork vertical center under “My Items”
 2014-05-30 16:56:57 -04:00
Christopher Grande
ce73f951e2 Merge remote-tracking branch 'original/Munki2' into Munki2 2014-05-30 14:18:04 -04:00
Greg Neagle
4251fc95d9 Workaround for zipfile.ZipFile.expand() under Python 2.6 (and therefore OS X 10.6) where directories in the zip archive were not properly expanded. 2014-05-29 14:05:33 -07:00
Greg Neagle
f58fdd7a2c Build app pkg with preinstall script 2014-05-28 12:18:32 -07:00
Greg Neagle
88199f2f0f Add preinstall script to app package to clean up old Managed Software Update.app residue 2014-05-28 10:34:59 -07:00
Greg Neagle
b1ae981c7e Fix missing import 2014-05-28 08:13:27 -07:00
Greg Neagle
f6b290fdaa Clean up debug logging 2014-05-26 14:20:15 -07:00
Greg Neagle
f11a9765b1 Enable/disable controls dependant on if there are optional items available or not 2014-05-22 14:00:12 -07:00
Christopher Grande
c6c92e63f3 Merge remote-tracking branch 'original/Munki2' into Munki2 2014-05-21 19:56:00 -04:00
Greg Neagle
b390c7f46f munkiimport now offers to extract and upload product icons 2014-05-21 16:15:38 -07:00
Greg Neagle
7b6d99c368 Remove duplicate file named iconimporter.py (duplicate of iconimporter) 2014-05-15 13:44:21 -07:00
Greg Neagle
bf60710145 Add latest version of iconimporter tool 2014-05-14 13:33:46 -07:00
Greg Neagle
6ad408b932 Update local client resources after managedsoftwareupdate signals it has completed a run 2014-05-13 15:11:08 -07:00
Greg Neagle
50cf42f9ed Update comments in download_client_resources() to reflect actual behavior 2014-05-13 15:10:07 -07:00
Greg Neagle
f932d1d8b1 Change 'ClientResourceURLs' to 'ClientResourceURL' for consistency with other alternate URL keys 2014-05-13 10:43:52 -07:00
Christopher Grande
49ab9a1259 Merge remote-tracking branch 'original/Munki2' into Munki2 2014-05-12 18:47:38 -04:00
Greg Neagle
deddb20b81 Make default showcase, sidebar, and footer templates generic. 2014-05-12 11:11:11 -07:00
Greg Neagle
f5d3acb51e Use custom client resources if available. 2014-05-12 10:47:26 -07:00
Greg Neagle
36e61a0087 Check for and download custom client resources if available 2014-05-12 10:45:37 -07:00
Greg Neagle
ebaab3353e Fix localization build script for MunkiStatus.app 2014-05-02 11:20:19 -07:00
Greg Neagle
37d6b85720 MunkiStatus.app initial localization bits 2014-05-02 09:12:28 -07:00
Greg Neagle
3fadfd3100 Change Dutch localization from nl-NL.lproj to nl.lproj 2014-05-02 08:24:03 -07:00
Christopher Grande
aa42ac0720 Merge remote-tracking branch 'original/Munki2' into Munki2 2014-05-02 11:14:21 -04:00
Greg Neagle
28821dcbf7 More localization bits 2014-05-01 15:22:48 -07:00
Greg Neagle
298119a72e Fix script that generates localized .xibs 2014-05-01 10:57:16 -07:00
Greg Neagle
dd8231ce1f Add localization pieces 2014-05-01 10:02:32 -07:00
Christopher Grande
28f9200785 Merge remote-tracking branch 'original/Munki2' into Munki2 2014-04-24 15:37:24 -04:00
Greg Neagle
a0e3df47c3 Simplify logic when notifiying user of available updates. 2014-04-22 11:18:28 -07:00
Greg Neagle
a07aa74097 Downloading/installing UI progress tweaks 2014-04-18 16:04:15 -07:00
Greg Neagle
b01a330c2a Track user choices for install/removal; employ a different strategy for determining if an updatecheck is needed; display links to updates page for some item statuses 2014-04-10 15:23:41 -07:00
Greg Neagle
b231f863d5 Don't raise unhandled exception if MSUStatusController methods are invoked before a page is loaded/rendered on app launch. 2014-04-09 15:42:42 -07:00
Greg Neagle
c51a41ad5b Add page_not_found_template missing from previous commit 2014-04-08 07:09:09 -07:00