Changeset 80264

Timestamp:

07/07/11 21:34:06 (4 years ago)

Author:

fotanus@…

Message:

Perry code review results

File:

• branches/gsoc11-post-destroot/base/src/port1.0/portcheckdestroot.tcl (modified) (6 diffs)

branches/gsoc11-post-destroot/base/src/port1.0/portcheckdestroot.tcl

@@ -4 +4 @@
 package provide portcheckdestroot 1.0
 package require portutil 1.0
+
 
 set org.macports.checkdestroot [target_new org.macports.checkdestroot portcheckdestroot::checkdestroot_main]
@@ -25 +26 @@
     if { [getuid] == 0 && [geteuid] != 0 } {
         # if started with sudo but have dropped the privileges
-        ui_debug "Can't run destroot under sudo without elevated privileges (due to mtree)."
+        ui_debug "Can't run checkdestroot under sudo without elevated privileges (due to mtree)."
         ui_debug "Run destroot without sudo to avoid root privileges."
         ui_debug "Going to escalate privileges back to root."
@@ -32 +33 @@
         ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]."
     }
+}
+
+# List contents for a given port.
+proc portcheckdestroot::get_port_files {portname} {
 }
 
@@ -46 +51 @@
 # escape chars in order to be usable as regexp. This function is for internal use.
 proc portcheckdestroot::escape_chars {str} {
-    return [regsub {\+} $str {\+}]
+    return [regsub -all {\W} $str {\\&}]
 }
 
@@ -69 +74 @@
     foreach item [glob -nocomplain -type "d $type" -directory $dir *] {
         if {[file isdirectory $item]} {
-            set ret [concat $ret [types_list $item $type]]
+            set ret [concat $ret [types_list $item $type $bin]]
         } else {
             #is from the correct type
@@ -235 +240 @@
     set dep_files {}
     foreach dep [get_dependencies] {
-        lappend dep_files [get_files [exec port contents $dep]]
+        lappend dep_files [registry_port_registered $dep]
     }
     set self_files [bin_list $destroot$prefix]