Fix expanddeps error

Change-Id: Id0b1140f9836db058ce7133776bea4faf370c71a

diff --git a/createrepomddeps b/createrepomddeps
index 9f0cf00b5c9d79a9863242fc21fe21d6ff735afc..d1dbf7ef4ee263aa6cde5bbd3bc049263cb68e61 100755 (executable)
--- a/createrepomddeps
+++ b/createrepomddeps
@@ -61,6 +61,8 @@ my $primaryparser = {
        'rpm:requires' => { 'rpm:entry' => { _start => \&primary_handle_package_requires }, },
        'rpm:conflicts' => { 'rpm:entry' => { _start => \&primary_handle_package_conflicts }, },
        'rpm:obsoletes' => { 'rpm:entry' => { _start => \&primary_handle_package_obsoletes }, },
+       'rpm:supplements' => { 'rpm:entry' => { _start => \&primary_handle_package_supplements }, },
+       'rpm:recommends' => { 'rpm:entry' => { _start => \&primary_handle_package_recommends }, },
        'rpm:buildhost' => { _text => \&primary_collect_text, _end => \&primary_store_text },
        'rpm:sourcerpm' => { _text => \&primary_collect_text, _end => \&primary_store_text },
 ### currently commented out, as we ignore file provides in createrpmdeps
@@ -310,6 +312,16 @@ sub primary_handle_package_deps
 
 }
 
+sub primary_handle_package_supplements
+{
+  shift;shift; primary_handle_package_deps('supplements', @_);
+}
+
+sub primary_handle_package_recommends
+{
+  shift;shift; primary_handle_package_deps('recommends', @_);
+}
+
 sub primary_handle_package_conflicts
 {
   shift;shift; primary_handle_package_deps('conflicts', @_);
@@ -361,6 +373,12 @@ sub printasbuildcachefile(@)
     $deps = deps2string(@{$pkg->{'requires'}});
     print "R:$id$deps\n";
 
+    $deps = deps2string(@{$pkg->{'recommends'}});
+    print "r:$id$deps\n" if $deps;
+
+    $deps = deps2string(@{$pkg->{'supplements'}});
+    print "s:$id$deps\n" if $deps;
+
     my $tag = sprintf("%s-%s-%s %s",
       $pkg->{'name'},
       $pkg->{'ver'},

diff --git a/expanddeps b/expanddeps
index 5d7edf46abc45bb7a8b9f6f364feca612ea287f2..9b3c34ea1b7b0fae515a436bd2342e0990252431 100755 (executable)
--- a/expanddeps
+++ b/expanddeps
@@ -159,8 +159,10 @@ while(<F>) {
     $req{$1} = $2;
   } elsif (/^r:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgr = $2;
+    $rec{$1}  = $pkgr if defined $pkgr;
   } elsif (/^s:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     $pkgs = $2;
+    $sup{$1}  = $pkgs if defined $pkgs;
   } elsif (/^I:(.*?)-\d+\/\d+\/\d+: (.*)$/) {
     my $r = 0;
     if ($usehigherdeps) {