Changeset 1834 in ProjectBuilder

Timestamp:

Jan 7, 2014, 12:40:52 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix bugs in Distribution.pm preventing debian VM to be setup anymore

File:

• devel/pb-modules/lib/ProjectBuilder/Distribution.pm (modified) (3 diffs)

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

@@ -561 +561 @@
         pb_system("wget -O $ENV{'PBTMP'}/$bn $i","Downloading additional repository file $i");
     } else {
-        copy($i,$ENV{'PBTMP'}/$bn);
+        copy($i,"$ENV{'PBTMP'}/$bn");
     }
 
@@ -586 +586 @@
             }
             my $dest = "$dirdest/$bn";
-            return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
             confess "Missing directory $dirdest ($reponame)" unless (-d $dirdest);
             pb_system("sudo mv $ENV{'PBTMP'}/$bn $dirdest/$bn","Adding $reponame repository") if (not -f "$dirdest/$bn");
@@ -599 +599 @@
         if ($bn =~ /\.sources.list$/) {
             my $dest = "/etc/apt/sources.list.d/$bn";
-            return if (pb_distro_compare_repo($ENV{'PBTMP'}/$bn,$dest));
+            return if (pb_distro_compare_repo("$ENV{'PBTMP'}/$bn",$dest));
             pb_system("sudo mv $ENV{'PBTMP'}/$bn /etc/apt/sources.list.d","Adding apt repository");
             pb_system("sudo apt-get update","Updating apt repository");