Anonymous avatar Anonymous committed 80266e7

l10nmove: adjust repository handling

Comments (0)

Files changed (1)

solenv/bin/cws.pl

     $hg_remote_source = $config->get_hg_source(uc $rep_type, 'REMOTE');
 
     my $masterws = $cws->master();
-    my $master_local_source = "$hg_local_source/" . $masterws;
-    my $master_lan_source = "$hg_lan_source/" . $masterws;
+    my ($master_local_source, $master_lan_source);
+    if ($rep_type eq "ooo" || $rep_type eq "so")
+    {
+        $master_local_source = "$hg_local_source/" . $masterws;
+        $master_lan_source = "$hg_lan_source/" . $masterws;
+    }
+    else
+    {
+        $master_local_source = "$hg_local_source/master_".$rep_type."/".$masterws;
+        $master_lan_source = "$hg_lan_source/master_".$rep_type."/".$masterws;
+    }
 
     my $milestone_tag;
     if ( $clone_milestone_only ) {
         require LWP::Simple;
         my $content = LWP::Simple::get($cws_remote_source);
         my $pattern = "<title>cws/". $cws->child();
-        if ( $content && $content =~ /$pattern/ ) {
+        my $pattern2 = "<title>cws_".$rep_type."/". $cws->child();
+        if ( $content && ($content =~ /$pattern/ || $content =~ /$pattern2/) ) {
             $pull_from_remote = 1;
         }
         else {
 
     my $milestone_opt = $options_ref->{'milestone'};
     my $additional_repositories_opt = $options_ref->{'additionalrepositories'};
+    $additional_repositories_opt = "", if ( !defined $additional_repositories_opt );
     my $child = $options_ref->{'childworkspace'};
     my $platforms = $options_ref->{'platforms'};
     my $noautocommon = $options_ref->{'noautocommon'};
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.