Commit Graph

1524 Commits

Author SHA1 Message Date
Greg Neagle
195553e34d MunkiStatus: Set LSUIElement to True in Info.plist since we don't want a menubar or Dock icon; Change status window title to 'Managed Software Center'; use git rev-list --count to generate psuedo-revision-count for automatic versioning 2014-06-25 18:26:18 -07:00
Greg Neagle
79093c048f Merging Arjen's MUNKI_VERBOSITY_LEVEL environment variable 2014-06-24 15:39:02 -07:00
Arjen van Bochoven
2af6c13f87 Renamed VERBOSE to MUNKI_VERBOSITY_LEVEL 2014-06-25 00:23:32 +02:00
Greg Neagle
861a6a3d9d Add missing module name in munkiimport's generate_pngs_from_installer_pkg; fixes a crash when extracting an icon from a pkg item 2014-06-24 14:05:00 -07:00
Arjen van Bochoven
62986bac54 Store verbosity level in environment variable
Pre- and post-flight scripts can use verbosity level from managedinstall
2014-06-23 23:33:04 +02:00
Greg Neagle
7553e942e7 Refactor iconimporter to use munkilib/iconutils.py; fix some broken error reporting in munkilib/iconutils.py 2014-06-19 21:33:31 -07:00
Greg Neagle
90752e2f97 When running managedsoftwareupdate in --auto mode, if the Munki repo server is not available, do not exit immediately, but attempt to install any cached updates (either those marked for unattended_install or if at the loginwindow, all updates) 2014-06-19 15:12:13 -07:00
Greg Neagle
b24b7814b0 Add RestartAction to available keys in optional_installs items so that MSC.app can display the info. 2014-06-19 08:29:51 -07:00
Greg Neagle
ba1108afac Add support to Managed Software Center.app for InstallRequiresLogout preference. 2014-06-18 22:52:59 -07:00
Greg Neagle
197c15b293 More Unicode fixes; new preference to control debug logging. 2014-06-18 11:27:49 -07:00
Greg Neagle
6387970982 Some fixes for Unicode in filenames/URLs 2014-06-17 16:58:48 -07:00
Greg Neagle
aa770ad3a6 Revert "Initial stab at replacing curl with NSURLConnection and friends."
This reverts commit 56c856e469.
2014-06-16 15:35:27 -07:00
Greg Neagle
31ede658b6 Revert "Convert SSL error to string (from tuple) before displaying the error."
This reverts commit cf6c189bd9.
2014-06-16 15:35:26 -07:00
Greg Neagle
6203226244 Revert "keychain module added to import existing certs/keys into a keychain for use by gurl"
This reverts commit 42b6c62aeb.
2014-06-16 15:35:24 -07:00
Greg Neagle
1f11a84f0d Revert "Change all 'security' keychain references to use the full pathname"
This reverts commit 6443a43952.
2014-06-16 15:35:22 -07:00
Greg Neagle
5176ed1e36 Revert "When adding a trusted cert, modify admin Trust Settings (instead of user) so that a GUI authentication dialog is not displayed."
This reverts commit 6814c166e7.
2014-06-16 15:35:18 -07:00
Greg Neagle
d824dea3c1 Revert "Display debugging information for keychain operations and SSL errors"
This reverts commit a2872b768f.
2014-06-16 15:35:17 -07:00
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
b431eb4d18 Workaround for non-ASCII characters in version strings. 2014-05-30 15:00:02 -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