Subversion Repositories DevTools

Rev

Rev 3967 | Rev 4076 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3967 Rev 4030
Line 795... Line 795...
795 
                my $keep = 0;
 795 
                my $keep = 0;
796 
                foreach ( @newTldPaths )
 796 
                foreach ( @newTldPaths )
797 
                {
 797 
                {
798 
                    if ( $file =~ m~^$_/~ )
 798 
                    if ( $file =~ m~^$_/~ )
799 
                    {
 799 
                    {
800 
                        Verbose0("Merge Retain: $file");
 800 
                        Verbose("Merge Retain: $file");
801 
                        $keep = 1;
 801 
                        $keep = 1;
802 
                        last;
 802 
                        last;
803 
                    }
 803 
                    }
804 
                }
 804 
                }
805 
 
 805 
 
Line 812... Line 812...
812 
                    if ( m~(.+/)\*\*$~ )
 812 
                    if ( m~(.+/)\*\*$~ )
813 
                    {
 813 
                    {
814 
                        my $base = $1;
 814 
                        my $base = $1;
815 
                        if ( $file =~ m~^$base~ )
 815 
                        if ( $file =~ m~^$base~ )
816 
                        {
 816 
                        {
817 
                            Verbose0("Merge Retain: $file");
 817 
                            Verbose("Merge Retain: $file");
818 
                            $keep = 1;
 818 
                            $keep = 1;
819 
                            last;
 819 
                            last;
820 
                        }
 820 
                        }
821 
                    }
 821 
                    }
822 
                }
 822 
                }
823
823
824 
                next if ($keep);
 824 
                next if ($keep);
825 
            }
 825 
            }
826 
 
 826 
 
827 
            Verbose0 ("Removing $file");
 827 
            Verbose ("Removing $file");
828 
            $filesDeleted++ unless ( $file =~ m~/$~ );
 828 
            $filesDeleted++ unless ( $file =~ m~/$~ );
829 
            $dirsDeleted++ if ( $file =~ m~/$~ );
 829 
            $dirsDeleted++ if ( $file =~ m~/$~ );
830 
            unlink "$opt_workdir/$file";
 830 
            unlink "$opt_workdir/$file";
831 
            push @processedFiles, $file;
 831 
            push @processedFiles, $file;
832 
        }
 832 
        }
Line 896... Line 896...
896 
                    {
 896 
                    {
897 
                        $discard = 0;
 897 
                        $discard = 0;
898 
                        last;
 898 
                        last;
899 
                    }
 899 
                    }
900 
                }
 900 
                }
901 
                Verbose0("Not Importing: $file") if ( $discard ) ;
 901 
                Verbose("Not Importing: $file") if ( $discard ) ;
902 
                next if ( $discard );
 902 
                next if ( $discard );
903 
            }
 903 
            }
904 
 
 904 
 
905 
            my $src = "$opt_dir/$file";
 905 
            my $src = "$opt_dir/$file";
906 
            my $target = "$opt_workdir/$file";
 906 
            my $target = "$opt_workdir/$file";