Changeset 1521 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Distribution.pm

Timestamp:

May 12, 2012, 1:46:09 AM (12 years ago)

Author:

Bruno Cornec

Message:

• pb.conf: add auto-agree-with-licenses for opensuse, other failures on install can occur. partially fix dependencies for opensuse-11.2, stopped because the version isn't supported. remove cracklib-dict-small, not actually a dependency. (Eric Anderson)
• Distribution.pm: Fix bug, if we install with yum, put the repo in the yum location. If we install with zypper, put it in the zypper location. Otherwise complain that we don't know what to do with the file. (Eric Anderson/Bruno Cornec)

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -555 +555 @@
             }
         } elsif ($bn =~ /\.repo$/) {
-            # Yum repo
-            my $dest = "/etc/yum.repos.d/$bn";
+            my $dirdest = "";
+            my $reponame = "";
+            # TODO: could go in pb.conf in fact
+            if ($pbos->{install} =~ /\byum\b/) {
+                $reponame="yum";
+                $dirdest = "/etc/yum.repos.d";
+            } elsif ($pbos->{install} =~ /\bzypper\b/) {
+                $reponame="zypper";
+                $dirdest = "/etc/zypp/repos.d";
+            } else {
+                die "Unknown location for repository file for '$pbos->{install}' command";
+            }
+            my $dest = "$dirdest/$bn";
             return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
-            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/yum.repos.d","Adding yum repository") if (not -f "/etc/yum.repos.d/$bn");
+            die "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn $dirdest/$bn","Adding $reponame repository") if (not -f "$dirdest/$bn");
         } elsif ($bn =~ /\.addmedia/) {
             # URPMI repo