[Midnightbsd-cvs] mports [18845] trunk/Tools/lib/Magus/Index.pm: attempt to set depends type

[laffer1 at midnightbsd.org]

Revision: 18845
          http://svnweb.midnightbsd.org/mports/?rev=18845
Author:   laffer1
Date:     2015-05-09 02:04:17 -0400 (Sat, 09 May 2015)
Log Message:
-----------
attempt to set depends type

Modified Paths:
--------------
    trunk/Tools/lib/Magus/Index.pm

Modified: trunk/Tools/lib/Magus/Index.pm
===================================================================
--- trunk/Tools/lib/Magus/Index.pm	2015-05-09 05:50:55 UTC (rev 18844)
+++ trunk/Tools/lib/Magus/Index.pm	2015-05-09 06:04:17 UTC (rev 18845)
@@ -73,16 +73,12 @@
       pkgname     => $dump{pkgname},
     });     
 
-    # We only have one depend type, merge into a unique list
-    my %portdepends;
     while (my ($type, $deps) = each %{$dump{'depends'}}) {
       foreach my $dep (@$deps) {
-        $portdepends{$dep} = $type;
+	push($depends{$port->id}, \{ "name" => $dep, "type" => $type });
       }
     }
       
-    $depends{$port->id} = [keys %portdepends];
-      
     $class->sync_categories(\%dump, $port, $arch);
       
     if ($dump{is_interactive}) {
@@ -99,17 +95,17 @@
     my $port = Magus::Port->retrieve($id) || die "Got an invalid port in the depends list! ($id)";
 
     for (@$depends) {
-      my $depend = Magus::Port->retrieve(run => $run, name => $_);
+      my $depend = Magus::Port->retrieve(run => $run, name => $_->name);
       
       if (!$depend) {
-        warn "\tMissing depend for $port: $_\n";
-        $port->set_result_fail(qq(depend "$_" does not exist.));
+        warn "\tMissing depend for $port: $_->name\n";
+        $port->set_result_fail(qq(depend "$_->name" does not exist.));
         next PORT;
       }
       
       $port->add_to_depends({ 
         dependency => $depend,
-	type => $portdepends{$_}
+	type => $_->type
       });    
     }    
   }