Commit Graph

1540 Commits

Author SHA1 Message Date
Greg Neagle
769e4a930f Remove trailing whitespace from all lines in adobeutils.py, iconutils.py, launchd.py, munkistatus.py, updatecheck.py (code style issue) 2014-07-22 10:32:02 -07:00
Greg Neagle
7d79748174 Remove trailing whitespace from all lines in managedsoftwareupdate (code style issue) 2014-07-22 10:27:21 -07:00
Greg Neagle
76fac17a40 Remove trailing whitespace from all lines in iconimporter (code style issue) 2014-07-22 10:26:29 -07:00
Greg Neagle
4eca232c69 Remove trailing whitespace from all lines in launchapp (code style issue) 2014-07-22 10:25:11 -07:00
Greg Neagle
324301fe6b Removing no longer used updatecheckhelper from repo 2014-07-22 10:21:09 -07:00
Greg Neagle
b9c976f06f Remove trailing whitespace from all lines in supervisor (code style issue) 2014-07-22 10:19:40 -07:00
Greg Neagle
143b8af942 Remove trailing whitespace from all lines in munkiimport (code style issue) 2014-07-22 10:18:18 -07:00
Greg Neagle
e183d94ad7 Remove trailing whitespace from all lines in manifestutil (code style issue) 2014-07-22 10:16:26 -07:00
Greg Neagle
e118a18deb Update logouthelper to check for Managed Software Center instead of Managed Software Update 2014-07-22 10:04:02 -07:00
Greg Neagle
fa26662b78 Track issues that prevent installation and store them so MSC.app can display them and/or give better feedback. Also fixes issue 346. 2014-07-15 16:41:54 -07:00
Greg Neagle
13757c1e18 Fix traceback that occurs if 'hdiutil info' has error output in munkicommon.hdiutilInfo() 2014-07-14 14:10:53 -07:00
Greg Neagle
d0b19cb312 Fix CSS issue resulting in rounded bottom corners for the fourth row in software or categories view. Fixes issue 344. 2014-06-30 10:55:43 -07:00
Arjen van Bochoven
062062c7a8 Show manifest name for primary manifest
This helps a lot when debugging clients remotely
2014-06-29 11:32:23 -07:00
Greg Neagle
842738da01 When using lsbom to read pathnames, decode from UTF-8 to unicode. Attempt to fix issue 341. 2014-06-27 10:40:05 -07:00
Greg Neagle
d2fc890842 Updated build script to reflect new repo layout (specifically, the new code/apps directory), and to calculate a rev number for the apps pkg from the apps directory 2014-06-26 08:14:39 -07:00
Greg Neagle
b49b5fa558 Move both apps into an apps subdirectory so we can auto-increment app.pkg version if either app is updated 2014-06-25 18:59:57 -07:00
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