Revision: 91430 https://trac.macports.org/changeset/91430 Author: jmr@macports.org Date: 2012-04-01 13:15:08 -0700 (Sun, 01 Apr 2012) Log Message: ----------- don't exit pkg_start when already packaged, since target_runtype is always and ports may operate on the created files Modified Paths: -------------- trunk/base/src/package1.0/portpkg.tcl Modified: trunk/base/src/package1.0/portpkg.tcl =================================================================== --- trunk/base/src/package1.0/portpkg.tcl 2012-04-01 19:57:59 UTC (rev 91429) +++ trunk/base/src/package1.0/portpkg.tcl 2012-04-01 20:15:08 UTC (rev 91430) @@ -57,15 +57,10 @@ proc portpkg::pkg_start {args} { global packagemaker_path portpkg::packagemaker \ - portpkg::language portpkg::pkgpath xcodeversion portpath porturl \ + portpkg::language xcodeversion portpath porturl \ package.destpath package.resources package.scripts package.flat \ subport version description long_description homepage workpath os.major - set pkgpath "${package.destpath}/${subport}-${version}.pkg" - if {[file readable $pkgpath] && ([file mtime ${pkgpath}] >= [file mtime ${portpath}/Portfile])} { - return 0 - } - if {![info exists packagemaker_path]} { if {[vercmp $xcodeversion 4.3] >= 0} { set packagemaker_path /Applications/PackageMaker.app @@ -115,9 +110,9 @@ proc portpkg::package_pkg {portname portversion portrevision} { global UI_PREFIX portdbpath destpath workpath prefix description \ package.flat portpath os.version os.major \ - package.resources package.scripts portpkg::packagemaker portpkg::language \ - portpkg::pkgpath + package.resources package.scripts portpkg::packagemaker portpkg::language + set pkgpath "${package.destpath}/${subport}-${version}.pkg" if {[file readable $pkgpath] && ([file mtime ${pkgpath}] >= [file mtime ${portpath}/Portfile])} { ui_msg "$UI_PREFIX [format [msgcat::mc "Package for %s-%s is up-to-date"] ${portname} ${portversion}]" return 0