From 93fa3f837ca97e609345cd84fba515396b7de9a1 Mon Sep 17 00:00:00 2001 From: Heig Gregorian Date: Wed, 22 Aug 2012 14:07:59 -0700 Subject: [PATCH] Minor doc and formatting update to previous commit; no functional difference --- code/client/munkilib/munkicommon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/client/munkilib/munkicommon.py b/code/client/munkilib/munkicommon.py index b903533a..324533c9 100644 --- a/code/client/munkilib/munkicommon.py +++ b/code/client/munkilib/munkicommon.py @@ -849,12 +849,12 @@ def unmountdmg(mountpoint): stderr=subprocess.PIPE) (unused_output, err) = proc.communicate() if proc.returncode: - cmd.append('-force') + # ordinary unmount unsuccessful, try forcing display_warning('Polite unmount failed: %s' % err) display_warning('Attempting to force unmount %s' % mountpoint) - # try forcing the unmount + cmd.append('-force') proc = subprocess.Popen(cmd, bufsize=1, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + stderr=subprocess.PIPE) if proc.returncode: display_warning('Failed to unmount %s' % mountpoint)