From 458d423d01de9bfc87696c8351ec06805e3b7807 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Fri, 8 Sep 2006 15:15:24 +0000
Subject: - add productid management

---
 lib/MDV/Distribconf.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/MDV/Distribconf.pm')

diff --git a/lib/MDV/Distribconf.pm b/lib/MDV/Distribconf.pm
index 0eb5529..ce37230 100644
--- a/lib/MDV/Distribconf.pm
+++ b/lib/MDV/Distribconf.pm
@@ -440,11 +440,16 @@ sub getvalue {
             $default =~ s![/ ]+!_!g;
             last;
         };
+        /^productid$/   and do {
+            return join(',', map { "$_=" . $distrib->getvalue(undef, $_, '') }
+                qw(vendor distribution type version branch release arch product));
+        };
         /^path$/		and return $media;
         /^root$/		and return $distrib->{root};
         /^mediacfg_version$/	and 
             return $distrib->{cfg}->val('media_info', 'mediacfg_version') || 1;
         /^VERSION$/		and do { $default = 'VERSION'; last };
+        /^product.id$/	and do { $default = 'product.id'; last };
         /^product$/		and do { $default = 'Download'; last };
         /^(MD5SUM|depslist.ordered|compss|provides)$/      
                         and do { $default = $_; last };
@@ -467,7 +472,7 @@ sub getpath {
     $distrib->mediaexists($media) or return;
     $var ||= ""; # Avoid undef value
     my $val = $distrib->getvalue($media, $var);
-    $var =~ /^(?:root|VERSION|(?:media|info)dir)$/ and return $val;
+    $var =~ /^(?:root|VERSION|product\.id|(?:media|info)dir)$/ and return $val;
     my $thispath = $var eq 'path' ? $distrib->{mediadir} : $distrib->{infodir};
     if ($distrib->getvalue(undef, 'mediacfg_version') >= 2) {
         return $thispath . '/' . $val;
-- 
cgit v1.2.1