1. mst
  2. ooo340

Commits

Ivo Hinkelmann  committed 21f73a4

l10nmove: minor fixes

  • Participants
  • Parent commits 997a96d
  • Branches default

Comments (0)

Files changed (2)

File solenv/bin/cws.pl

View file
  • Ignore whitespace
     my $pull_from_remote = 0;
     my $cws_remote_source;
     if ( !$clone_milestone_only ) {
-        $cws_remote_source = "$hg_remote_source/cws/" . $cws->child();
+        if ($rep_type eq "ooo" || $rep_type eq "so")
+        {
+            $cws_remote_source = "$hg_remote_source/cws/" . $cws->child();
+        }
+        # e.g. cws_l10n 
+        else
+        {
+             $cws_remote_source = "$hg_remote_source/cws_".$rep_type."/" . $cws->child();
+        }
 
         # The outgoing repository might not yet be available. Which is not
         # an error. Since pulling from the cws outgoing URL results in an ugly
                 print_error("Can't create directory '$work_master': $!.", 8);
             }
 
-            my %unique = map { $_ => 1 } split(/,/,$additional_repositories_opt);
+            my %unique = map { $_ => 1 } split(/","/,$additional_repositories_opt);
             my @unique_repo_list = keys %unique;
 
             if (defined($additional_repositories_opt))
             {
                 foreach my $repo(@unique_repo_list) 
                 {
-                    hg_clone_cws_or_milestone($repo, $cws, "$work_master/".$repo, $clone_milestone_only), if $repo ne "ooo" || $repo ne "sun";
+                    # do not double clone ooo and sun
+                    hg_clone_cws_or_milestone($repo, $cws, "$work_master/".$repo, $clone_milestone_only), if $repo ne "ooo" && $repo ne "sun";
                 }
 
             }

File solenv/bin/modules/CwsConfig.pm

View file
  • Ignore whitespace
     my $repository  = shift;
     my $location    = shift;
 
+    #Special prefix handling, see cwsrc
     if ($repository eq "OOO")
     {
         if ($location eq "LOCAL")