Changeset 711

Timestamp:

02/20/09 18:38:50 (4 years ago)

Author:

bruno

Message:

Use the directory /etc/pat/sources.list.d to put the new apt repo at build time. Much cleaner

Location:

devel

Files:

• pb-doc/pb-presentation.odp (modified) (previous)
• pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

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

@@ -521 +521 @@
     } elsif ($dtype eq "deb") {
         if ($bn =~ /\.sources.list$/) {
-            my $aptrepo = "";
-            open(REPO,"$ENV{'PBTMP'}/$bn") || die "Unable to open $ENV{'PBTMP'}/$bn";
-            while (my $repo=<REPO>) {
-                my $found = 0;
-                open(APT,"/etc/apt/sources.list") || die "Unable to open /etc/apt/sources.list";
-                while (my $apt=<APT>) {
-                    $found++ if ($apt =~ /$repo/);
-                }
-                close(APT);
-                $aptrepo .= "$repo\n" if ($found == 0);
-            }
-            close(REPO);
-            if ($aptrepo ne "") {
-                pb_system("sudo echo # Added by project-builder.org >> /etc/apt/sources.list");
-                pb_system("sudo echo #  >> /etc/apt/sources.list");
-                pb_system("sudo echo \'$aptrepo\' >> /etc/apt/sources.list");
-            }
-            pb_system("sudo apt-get update","Adding apt repository");
+            pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
+            pb_system("sudo apt-get update","Updating apt repository");
         } else {
             pb_log(0,"Unable to deal with repository file $i on deb distro ! Please report to dev team\n");