Author: jw Date: 2006-09-10 21:11:23 +0200 (Sun, 10 Sep 2006) New Revision: 1864 Modified: tools/prt-get/trunk/ChangeLog tools/prt-get/trunk/TODO tools/prt-get/trunk/src/installtransaction.cpp Log: prt-get: revert getPkgDest; use fgrep to determine PKGMK_PACKAGE_DIR Modified: tools/prt-get/trunk/ChangeLog =================================================================== --- tools/prt-get/trunk/ChangeLog 2006-09-10 18:29:30 UTC (rev 1863) +++ tools/prt-get/trunk/ChangeLog 2006-09-10 19:11:23 UTC (rev 1864) @@ -1,6 +1,8 @@ * 0.5.14 00.00.200x Johannes Winkelmann - Remove handling of external dependency list - make InstallTransaction::getPkgDest use pkgmk.conf from install-root +- revert getPkgDest to ignore install-root +- determine PKGMK_PACKAGE_DIR using fgrep without sourcing pkgmk.conf * 0.5.13 08.09.2006 Johannes Winkelmann - Show undecided versions in diff and sysup when using "prefer higher" Modified: tools/prt-get/trunk/TODO =================================================================== --- tools/prt-get/trunk/TODO 2006-09-10 18:29:30 UTC (rev 1863) +++ tools/prt-get/trunk/TODO 2006-09-10 19:11:23 UTC (rev 1864) @@ -1,7 +1,5 @@ - handle 27e < 28 in version comperator - add --rebuild-set to dependent -- use `eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' $(which pkgmk) /etc/pkgmk.conf) && echo -$PKGMK_PACKAGE_DIR` to determine PACKAGE_DIR - allow dependency injection for sysup, with previews - prefer toolchain (patch in trac) - logging: check for non-root owned symlinks Modified: tools/prt-get/trunk/src/installtransaction.cpp =================================================================== --- tools/prt-get/trunk/src/installtransaction.cpp 2006-09-10 18:29:30 UTC (rev 1863) +++ tools/prt-get/trunk/src/installtransaction.cpp 2006-09-10 19:11:23 UTC (rev 1864) @@ -582,11 +582,16 @@ return SUCCESS; } + +/* + * getPkgDest assumes that you're in the build directory already + */ string InstallTransaction::getPkgDest(const string& installRoot) { string pkgdest = ""; - string cmd = ". %s/etc/pkgmk.conf && echo $PKGMK_PACKAGE_DIR"; - StringHelper::replaceAll(cmd, "%s", installRoot); + string cmd = "eval $(fgrep -h 'PKGMK_PACKAGE_DIR=' " + "/usr/bin/pkgmk /etc/pkgmk.conf) " + "&& echo $PKGMK_PACKAGE_DIR"; FILE* p = popen(cmd.c_str(), "r"); if ( p ) { char line[256];