[82437] branches/gsoc11-post-destroot/base

[fotanus at macports.org]

Revision: 82437
          http://trac.macports.org/changeset/82437
Author:   fotanus at macports.org
Date:     2011-08-13 15:28:37 -0700 (Sat, 13 Aug 2011)
Log Message:
-----------
Merged files_whitelist and folders_whitelist files on whitelist.conf

when parsing, divide for folders and files whitelist.

Modified Paths:
--------------
    branches/gsoc11-post-destroot/base/doc/Makefile
    branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl

Removed Paths:
-------------
    branches/gsoc11-post-destroot/base/doc/files_whitelist.conf
    branches/gsoc11-post-destroot/base/doc/folders_whitelist.conf

Modified: branches/gsoc11-post-destroot/base/doc/Makefile
===================================================================
--- branches/gsoc11-post-destroot/base/doc/Makefile	2011-08-13 22:10:32 UTC (rev 82436)
+++ branches/gsoc11-post-destroot/base/doc/Makefile	2011-08-13 22:28:37 UTC (rev 82437)
@@ -1,7 +1,7 @@
 MAN1=		port.1
 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=	..
 

Deleted: branches/gsoc11-post-destroot/base/doc/files_whitelist.conf
===================================================================
--- branches/gsoc11-post-destroot/base/doc/files_whitelist.conf	2011-08-13 22:10:32 UTC (rev 82436)
+++ branches/gsoc11-post-destroot/base/doc/files_whitelist.conf	2011-08-13 22:28:37 UTC (rev 82437)
@@ -1,4 +0,0 @@
-libSystem.B.dylib
-libstdc++.6.dylib
-libstdc++.8.dylib
-libutil.dylib

Deleted: branches/gsoc11-post-destroot/base/doc/folders_whitelist.conf
===================================================================
--- branches/gsoc11-post-destroot/base/doc/folders_whitelist.conf	2011-08-13 22:10:32 UTC (rev 82436)
+++ branches/gsoc11-post-destroot/base/doc/folders_whitelist.conf	2011-08-13 22:28:37 UTC (rev 82437)
@@ -1 +0,0 @@
-/System/Library

Modified: branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl	2011-08-13 22:10:32 UTC (rev 82436)
+++ branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl	2011-08-13 22:28:37 UTC (rev 82437)
@@ -530,18 +530,21 @@
     }
 
     # 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
+    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::${whitelist}
         }
     }
+    global macports::folders_whitelist
+    global macports::files_whitelist
 
     # Process per-user only settings
     set per_user "${macports_user_dir}/user.conf"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110813/a30763dd/attachment.html>