[patch] stacked support, unified patch

ufed-unified.patch (text/plain), 2.31 KB, created by Luca Barbato on 2004-10-05 15:56:12 UTC

--- /usr/sbin/ufed	2004-09-21 09:26:50.000000000 +0200
+++ /var/lib/gentoo-src/ufed/ufed.pl	2004-06-03 06:58:49.000000000 +0200
@@ -2,7 +2,7 @@
 
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /home/cvsroot/gentoo-src/ufed/ufed.pl,v 1.18 2003/08/11 04:44:03 fava Exp $
+# $Header: /var/cvsroot/gentoo-src/ufed/ufed.pl,v 1.19 2004/06/03 04:58:49 fava Exp $
 
 # If you make ANY changes, please put them directly to the CVS log. The
 # ChangeLog file is generated automatically from that data.
@@ -510,56 +510,24 @@
    # the associated flag is emabled
    my ($flag, $package);
    my @flags;
-   my $tmppath;
-   my @tmpitem;
-   my @items;
-   my $path;
-   #open(FILE, '/etc/make.profile/use.defaults') or die ('couldn\'t open ' . "use.defaults");
-   $path = readlink '/etc/make.profile';
-   $path =~ s!\.\.!!;
-   @items = split /\//, $path ;
-   while(@items) 
-   { 
-      $tmppath = join '/', @items ; 
-      if (open(FILE1,$tmppath . "/use.defaults")) 
-      {
-         while (<FILE1>)
-         {
-            s!#.*!!;
-            ($flag, $package) = split (m![\t ]+!);
-            $flag    =~ s![ \t]!!g;
-            $package =~ s![ \t]!!g;
-            chomp($package);
+   open(FILE, '/etc/make.profile/use.defaults') or die ('couldn\'t open ' . "use.defaults");
 
-            if ((defined($package)) and my_glob("/var/db/pkg/$package"))
-            {
-	       #the package exists, therefore we add the use flag
-               push (@flags, $flag);
-            }
-         }
-         close(FILE1);
-      }
+   while (<FILE>)
+   {
+      s!#.*!!;
+      ($flag, $package) = split (m![\t ]+!);
+      $flag    =~ s![ \t]!!g;
+      $package =~ s![ \t]!!g;
+      chomp($package);
 
-      open (FILE,$tmppath . '/parent') or last;
-      while (<FILE>)
+      if ((defined($package)) and my_glob("/var/db/pkg/$package"))
       {
-         s!#.*!!;
-         s!\n!!g;
-         @tmpitem = split /\//, $_;
-         for my $buf (@tmpitem)
-         {
-	    if ($buf =~ /\.\./) 
-	    {
-	       pop @items;
-	    }
-            else
-	    {
-	       push @items, $buf;
-	    }
-         }
+
+         #the package exists, therefore we add the use flag
+         push (@flags, $flag);
       }
-      close(FILE);
    }
+   close(FILE);
    return (@flags);
 }