Subversion Repositories DevTools

Rev

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

Rev 6987 Rev 6990
Line 764... Line 764...
764
    #   Determine Manifest File name
764
    #   Determine Manifest File name
765
    #
765
    #
766
    foreach my $file ( glob ($pkg_dir . '/Manifest*' ) )
766
    foreach my $file ( glob ($pkg_dir . '/Manifest*' ) )
767
    {
767
    {
768
            next unless ( -f $file );
768
            next unless ( -f $file );
-
 
769
            next if ( $file  =~ m~\.sig~i );
769
            Warning ("Multiple Manifest Files find. Only the first will be used",
770
            Warning ("Multiple Manifest Files find. Only the first will be used",
770
                     "Using: $manifest",
771
                     "Using: $manifest",
771
                     "Ignoring: $file" ) if ( $manifest );
772
                     "Ignoring: $file" ) if ( $manifest );
772
            $manifest = $file;
773
            $manifest = $file;
773
    }
774
    }
Line 985... Line 986...
985
    #
986
    #
986
    unless ($manifest) {
987
    unless ($manifest) {
987
        foreach my $file ( glob ($pkgDir . '/Manifest*' ) )
988
        foreach my $file ( glob ($pkgDir . '/Manifest*' ) )
988
        {
989
        {
989
                next unless ( -f $file );
990
                next unless ( -f $file );
-
 
991
                next if ( $file  =~ m~\.sig~i );
990
                if ( $manifest ) {
992
                if ( $manifest ) {
991
                    Warning ("Multiple Manifest Files find. Only the first will be used",
993
                    Warning ("Multiple Manifest Files find. Only the first will be used",
992
                             "Using: $manifest",
994
                             "Using: $manifest",
993
                             "Ignoring: $file" ) ;
995
                             "Ignoring: $file" ) ;
994
                    next;
996
                    next;