Changeset 101504 for trunk/base

Timestamp:

Jan 12, 2013, 4:19:14 AM (11 years ago)

Author:

blair@…

Message:

portextract::extract_main: use_dmg fails to mount DMG is user isn't root.

The MacPorts user may not be able to mount a DMG with hdiutil; it will
fail with an "hdiutil: attach failed - Device not configured" error.
So only if a DMG is being used, elevate back to root to do the mount
and unmount the DMG.

File:

• trunk/base/src/port1.0/portextract.tcl (modified) (2 diffs)

trunk/base/src/port1.0/portextract.tcl

@@ -114 +114 @@
 
 proc portextract::extract_main {args} {
-    global UI_PREFIX filespath worksrcpath extract.dir usealtworkpath altprefix
+    global UI_PREFIX filespath worksrcpath extract.dir usealtworkpath altprefix use_dmg
 
     if {![exists distfiles] && ![exists extract.only]} {
@@ -130 +130 @@
             option extract.args "'[option distpath]/$distfile'"
         }
-        if {[catch {command_exec extract} result]} {
+
+        # If the MacPorts user does not have the privileges to mount a
+        # DMG then hdiutil will fail with this error:
+        #   hdiutil: attach failed - Device not configured
+        # So elevate back to root.
+        if {[tbool use_dmg]} {
+            elevateToRoot {extract dmg}
+        }
+        set code [catch {command_exec extract} result]
+        if {[tbool use_dmg]} {
+            dropPrivileges
+        }
+        if {$code} {
             return -code error "$result"
         }