Subversion Repositories DevTools

Rev

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

Rev 1594 Rev 1596
Line 4824... Line 4824...
4824
        {
4824
        {
4825
            Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$PkgBaseDir] : $!");
4825
            Error("Failed to copy info file [$PKG_UTIL_DIR/$i] to [$PkgBaseDir] : $!");
4826
        }
4826
        }
4827
    }
4827
    }
4828
 
4828
 
-
 
4829
    #
-
 
4830
    #   Scan the install 'image' looking for files and directories that have a 'space' in the name
-
 
4831
    #   These are not handled by the pkgmk utility, so it is best to create a nice error message now.
-
 
4832
    #
-
 
4833
    my $search = LocateFiles->new( recurse => 1, dirs_too => 1 );
-
 
4834
    $search->filter_in_re('\s');                                  
-
 
4835
    my @m_nfiles = $search->search($PkgBaseDir);                                  
-
 
4836
    if ( @m_nfiles )
-
 
4837
    {
-
 
4838
        Error ("Pathnames containing a space cannot be packaged under Solaris",
-
 
4839
               "The following paths contain a space",
-
 
4840
               @m_nfiles );
-
 
4841
    }
4829
 
4842
    
4830
    my ( $m_pkgmkCmd );
4843
    my ( $m_pkgmkCmd );
4831
    my ( $m_pkgtransCmd );
4844
    my ( $m_pkgtransCmd );
4832
    $m_pkgmkCmd = "pkgmk -o " .
4845
    $m_pkgmkCmd = "pkgmk -o " .
4833
                  "-f $PkgBaseDir/prototype " .
4846
                  "-f $PkgBaseDir/prototype " .
4834
                  "-d $PkgBaseDir";
4847
                  "-d $PkgBaseDir";
Line 7789... Line 7802...
7789
}
7802
}
7790
 
7803
 
7791
#===============================================================================
7804
#===============================================================================
7792
#
7805
#
7793
#   Internal Package
7806
#   Internal Package
7794
#   An attempt to simplify the WildCardinf interface by capturing the parameters
7807
#   An attempt to simplify the WildCarding interface by capturing the parameters
7795
#   in a package. The idea is that storing the arguments can be easier
7808
#   in a package. The idea is that storing the arguments can be easier
7796
#
7809
#
7797
package LocateFiles;
7810
package LocateFiles;
7798
use JatsError;
7811
use JatsError;
7799
 
7812
 
Line 7829... Line 7842...
7829
    }
7842
    }
7830
    return $self;
7843
    return $self;
7831
}
7844
}
7832
 
7845
 
7833
#-------------------------------------------------------------------------------
7846
#-------------------------------------------------------------------------------
7834
# Function        : recurse
7847
# Function        :  Class accessor fucntions
7835
#                   filter_in
7848
#                   recurse                     - Recurse subdirs
7836
#                   filter_in_re
7849
#                   filter_in                   - Filter in these files
-
 
7850
#                   filter_in_re                - Filter in (Regular Expression)
7837
#                   filter_out
7851
#                   filter_out                  - Filter out these files
7838
#                   filter_out_re
7852
#                   filter_out_re               - Filter out (RE)
7839
#                   base_dir
7853
#                   base_dir                    - Base dir for search
-
 
7854
#                   results                     - Results of the last search
-
 
7855
#                   dirs_too                    - Include dirs in the search
-
 
7856
#                   has_filter                  - Has any filter been defined
7840
#                   results
7857
#                   search                      - Perform the search
7841
#
7858
#
7842
# Description     : Accessor functions
7859
# Description     : Accessor functions
7843
#
7860
#
7844
# Inputs          : class
7861
# Inputs          : class
7845
#                   One argument (optional)
7862
#                   One argument (optional)