--- /opt/csw/bin/pkg-get Sun May 31 16:23:13 2009 +++ pkg-get Tue Jan 4 09:50:53 2011 @@ -702,7 +702,7 @@ if [[ "$i_remversion" == "$i_currversion" ]] ; then #if (( $debug > 0 )); then - # print "dependancy check to $1: up to date" + # print "dependency check to $1: up to date" #fi return 0 fi @@ -710,7 +710,7 @@ if [[ $? -ne 0 ]] ; then # remote version not the same, and not newer: must be older? #if (( $debug > 0 )); then - # print "dependancy check to $1: local NEWER?" + # print "dependency check to $1: local NEWER?" # print "Ignoring" #fi return 0 @@ -721,11 +721,11 @@ } # get_deps_from_cat: only works for catalogformat>=2 -# It requires dependancy info in the catalog! +# It requires dependency info in the catalog! # This is polymorphic: takes either PKGname, or softwarename. # requires that PKGname always start with uppercase, and # softwarename always start with lowercase. -# It extracts the dependancies field, and prints it out as a +# It extracts the dependencies field, and prints it out as a # space-separated list. # HOWEVER: if deps=="none", it will return "" # @@ -854,7 +854,7 @@ # xxxx -R like chown? # Separate from "upgrade_all" perhaps?? if deps_outofdate $pkgname ; then - print Error: dependancies for $i_sftname not up to date. >/dev/fd/2 + print Error: dependencies for $i_sftname not up to date. >/dev/fd/2 if (( $debug > 0 )) ; then print "Relevant packages needing download:" @@ -1031,9 +1031,9 @@ } # deps_outofdate PKGname # (requires catalogformat>=2) -# Goes through catalog-listed dependancy of PKGname -# Return true if a dependancy is installed, AND out of date. -# Return false, if all dependancies are EITHER "up to date", OR +# Goes through catalog-listed dependency of PKGname +# Return true if a dependency is installed, AND out of date. +# Return false, if all dependencies are EITHER "up to date", OR # just not installed. function deps_outofdate { typeset deplist="" @@ -1047,8 +1047,8 @@ # Passed in a 'depend' file as arg 1. -# Parse it, and try to install any missing dependancies. -# XXX this wont handle dependancies with revisions, currently. +# Parse it, and try to install any missing dependencies. +# XXX this wont handle dependencies with revisions, currently. # Additionally, it will REMOVE conflicting packages. # The benefit of this, is that it allows for renaming of PKGnames. # The drawback is that you have to be really really careful what you @@ -1090,11 +1090,11 @@ dependsoftname=`find_software_name $dependpkg` if [[ $? -ne 0 ]] ; then - print ERROR: no info for $dependpkg. Cannot install dependancy. + print ERROR: no info for $dependpkg. Cannot install dependency. return 1 fi - print Trying to install dependancy $dependsoftname + print Trying to install dependency $dependsoftname upgrade $dependsoftname #did it work? @@ -1104,7 +1104,7 @@ return 1 fi - # We have installed the dependancy. next! + # We have installed the dependency. next! continue fi @@ -1119,12 +1119,12 @@ continue fi - # dependancy IS installed already.. but is it up to date? + # dependency IS installed already.. but is it up to date? # if not, it must be updated first. which can only be done # safely, if we are in upgrade_all mode if ! uptodate $dependsoftname; then if (( $upgrade_all != 1 )); then - print "Error: dependancy $dependsoftname ($dependpkg) not up to date" + print "Error: dependency $dependsoftname ($dependpkg) not up to date" print "Call pkg-get again in 'upgrade' mode" print "eg: '$progname upgrade'" print This will then upgrade all packages cleanly @@ -1141,7 +1141,7 @@ # This will probably not get called. if debug is on, # we will probably be calling print_deps instead if (( $debug >1 )) ; then - print dependancy $dependsoftname is up to date + print dependency $dependsoftname is up to date fi fi @@ -1213,10 +1213,10 @@ # download directory, and cd'd to it already. # So extract and transform pkg in the current directory and look at 'depend' # -# If there are unmet dependancies, try to grab them, +# If there are unmet dependencies, try to grab them, # by invoking pkg-get in a separate process, so that # variable names dont conflict. -# However, we can only install dependancies if they are from the same +# However, we can only install dependencies if they are from the same # site, since we need to look up software name from pkgname. # # If do_upgrade is set, remove any older version of pkg before doing install @@ -1277,8 +1277,8 @@ if [[ -f $pkgname/install/depend ]] ; then handle_depend_file $pkgname/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: could not install required dependancies for $pkgname - print "Once dependancies are up to date, call" + print ERROR: could not install required dependencies for $pkgname + print "Once dependencies are up to date, call" print " $0 -i ${1%%-*}" print "to (re)install" @@ -1462,7 +1462,7 @@ # print_deps: # Usage: print_deps softname PKGname # -# Will print out missing/out of date dependancies of given software. +# Will print out missing/out of date dependencies of given software. # ONLY CALL THIS if catalogformat >= 2 # # This ONLY gets called if verbose/debug level is 1 or greater. @@ -1472,7 +1472,7 @@ # If debug==1, print out size and PKGname of needed downloads # If debug >=2, print out ALL deps, up to date or not. # -# "bug"(?): prints out all out-of-date dependancies, even if there is +# "bug"(?): prints out all out-of-date dependencies, even if there is # a buffer of up-to-date packages between top-level, and out-of-date # package lower down. # @@ -1479,7 +1479,7 @@ function print_deps { typeset deps_known="" deps_needed="" tmp_deps="" new_deps="" - # print "Evaluating dependancies of $1: (This may take a while...)" + # print "Evaluating dependencies of $1: (This may take a while...)" typeset pkgname nameblob rem_version local_version old_deps_flag=0 pkgname=`find_pkg_name $1` @@ -1488,7 +1488,7 @@ # I'd LIKE to use an associative array in here. # Unfortunately, /bin/ksh in sol8 is too old to support that. if (( $debug >1 )) ; then - print verbose level = $debug: printing ALL dependancies, needed or not + print verbose level = $debug: printing ALL dependencies, needed or not fi for dep in $deps_needed ; do @@ -1550,7 +1550,7 @@ # UUUUGLY long complicated mess. # [need to pick a name for this function!] # -# First, calculate direct dependancies of specified proggie that are out of date. +# First, calculate direct dependencies of specified proggie that are out of date. # (allow for proggie itself to be up to date!) # THEN, calculate all things that depend ON things that would be updated. # THEEEN, calculate if any of THOSE things will need to be updated as well! @@ -1562,7 +1562,7 @@ # xxxxx need to rewrite this, fro the original base of print_deps it was # copied from. - # print "Evaluating dependancies of $1: (This may take a while...)" + # print "Evaluating dependencies of $1: (This may take a while...)" typeset pkgname nameblob rem_version local_version old_deps_flag=0 pkgname=`find_pkg_name $1` @@ -1571,7 +1571,7 @@ # I'd LIKE to use an associative array in here. # Unfortunately, /bin/ksh in sol8 is too old to support that. if (( $debug >1 )) ; then - print verbose level = $debug: printing ALL dependancies, needed or not + print verbose level = $debug: printing ALL dependencies, needed or not fi for dep in $deps_needed ; do @@ -1662,7 +1662,7 @@ if (( $debug > 0 )) ; then if (( $catalogformat <2 )) ; then print DEBUG: would try to grab $graburl now - print " Not downloading, so cannot check dependancies" + print " Not downloading, so cannot check dependencies" return 0; fi # Otherwise, presume catalogformat >=2 ! @@ -2208,7 +2208,7 @@ #Given the name of a directory, and the name of a pkg-directory in it, # Remove any pre-existing packages, and install the new one # -# Check dependancies while we are at it. +# Check dependencies while we are at it. function dir_install_one { tmpdir="$1" tmppkg="$2" @@ -2216,7 +2216,7 @@ if [[ -f $tmpdir/$tmppkg/install/depend ]] ; then handle_depend_file $tmpdir/$tmppkg/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: could not install required dependancies for $tmppkg + print ERROR: could not install required dependencies for $tmppkg return 1 fi fi @@ -2561,8 +2561,8 @@ if [[ "$WGET" = "wget" ]] ; then - # Special 'static' (non-dependant) version, that makes upgrades safe, - # even if shared-lib dependancies get out of whack. + # Special 'static' (non-dependent) version, that makes upgrades safe, + # even if shared-lib dependencies get out of whack. # typeset fallbackdir=/var/pkg-get/`$UNAME -p` if [[ -x $fallbackdir/wget.static ]] ; then