Changeset 82437

Timestamp:

08/13/11 15:28:37 (4 years ago)

Author:

fotanus@…

Message:

Merged files_whitelist and folders_whitelist files on whitelist.conf

when parsing, divide for folders and files whitelist.

Location:

branches/gsoc11-post-destroot/base

Files:

• doc/Makefile (modified) (1 diff)
• doc/files_whitelist.conf (deleted)
• doc/folders_whitelist.conf (deleted)
• src/macports1.0/macports.tcl (modified) (1 diff)

branches/gsoc11-post-destroot/base/doc/Makefile

@@ -2 +2 @@
 MAN5=           macports.conf.5
 MAN7=           portfile.7 portstyle.7 porthier.7 portgroup.7
-CONF=       macports.conf pubkeys.conf sources.conf variants.conf files_whitelist.conf folders_whitelist.conf
+CONF=       macports.conf pubkeys.conf sources.conf variants.conf whitelist.conf
 INSTALLDIR=     ${DESTDIR}${prefix}
 TOPSRCDIR=      ..

branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl

@@ -531 +531 @@
 
     # Read dynamic libraries whitelist config files
-    set whitelist_conf_files {folders_whitelist files_whitelist}
-    foreach whitelist $whitelist_conf_files {
-        set file "${macports_conf_path}/${whitelist}.conf"
-        if { [file exists $file] } {
-            set macports::${whitelist} {}
-            set fd [open $file]
-            while { [gets $fd line] >= 0 } {
-                lappend macports::${whitelist} $line
-            }
-            global macports::${whitelist}
-        }
-    }
+    set whitelist_conf_file "${macports_conf_path}/whitelist.conf"
+    set macports::folders_whitelist {}
+    set macports::files_whitelist {}
+    if { [file exists $whitelist_conf_file] } {
+        set fd [open $whitelist_conf_file]
+        while { [gets $fd line] >= 0 } {
+            if { [file isdirectory $line] } {
+                lappend macports::folders_whitelist $line
+            } else {
+                lappend macports::files_whitelist $line
+            }
+        }
+    }
+    global macports::folders_whitelist
+    global macports::files_whitelist
 
     # Process per-user only settings