Revision: 822 http://trac.macosforge.org/projects/darwinbuild/changeset/822 Author: wsiegrist@apple.com Date: 2010-05-03 14:36:14 -0700 (Mon, 03 May 2010) Log Message: ----------- Merge PR-7935095 Modified Paths: -------------- trunk/darwinbuild.xcodeproj/project.pbxproj trunk/darwinup/Archive.cpp trunk/darwinup/Depot.cpp trunk/testing/darwinup/run-tests.sh Property Changed: ---------------- trunk/ trunk/darwinbuild/darwinbuild.in trunk/darwinbuild/darwinmaster.in trunk/darwinbuild/installXcode.in trunk/darwinbuild/packageRoots.in trunk/darwinbuild/thinPackages.in Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7935095:819-821 Property changes on: trunk/darwinbuild/darwinbuild.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinbuild.in:632-650 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /branches/PR-6729491/darwinbuild/darwinbuild.in:655-664 /branches/PR-6973110/darwinbuild/darwinbuild.in:804-813 /branches/PR-7250612/darwinbuild/darwinbuild.in:635-650 /branches/PR-7341154/darwinbuild/darwinbuild.in:682-694 /branches/PR-7431723/darwinbuild/darwinbuild.in:660-664 /branches/PR-7461534/darwinbuild/darwinbuild.in:650-664 /branches/PR-7489777/darwinbuild/darwinbuild.in:676-731 /branches/PR-7529688/darwinbuild/darwinbuild.in:692-694 /branches/PR-7593824/darwinbuild/darwinbuild.in:739-772 /branches/PR-7598640/darwinbuild/darwinbuild.in:703-731 /branches/PR-7748469/darwinbuild/darwinbuild.in:777-785 /branches/PR-7765119/darwinbuild/darwinbuild.in:790-791 /branches/PR-7798586/darwinbuild/darwinbuild.in:796-799 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinbuild.in:632-650 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /branches/PR-6729491/darwinbuild/darwinbuild.in:655-664 /branches/PR-6973110/darwinbuild/darwinbuild.in:804-813 /branches/PR-7250612/darwinbuild/darwinbuild.in:635-650 /branches/PR-7341154/darwinbuild/darwinbuild.in:682-694 /branches/PR-7431723/darwinbuild/darwinbuild.in:660-664 /branches/PR-7461534/darwinbuild/darwinbuild.in:650-664 /branches/PR-7489777/darwinbuild/darwinbuild.in:676-731 /branches/PR-7529688/darwinbuild/darwinbuild.in:692-694 /branches/PR-7593824/darwinbuild/darwinbuild.in:739-772 /branches/PR-7598640/darwinbuild/darwinbuild.in:703-731 /branches/PR-7748469/darwinbuild/darwinbuild.in:777-785 /branches/PR-7765119/darwinbuild/darwinbuild.in:790-791 /branches/PR-7798586/darwinbuild/darwinbuild.in:796-799 /branches/PR-7935095/darwinbuild/darwinbuild.in:819-821 Property changes on: trunk/darwinbuild/darwinmaster.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinmaster.in:632-650 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /branches/PR-6729491/darwinbuild/darwinmaster.in:655-664 /branches/PR-6973110/darwinbuild/darwinmaster.in:804-813 /branches/PR-7250612/darwinbuild/darwinmaster.in:635-650 /branches/PR-7341154/darwinbuild/darwinmaster.in:682-694 /branches/PR-7431723/darwinbuild/darwinmaster.in:660-664 /branches/PR-7461534/darwinbuild/darwinmaster.in:650-664 /branches/PR-7489777/darwinbuild/darwinmaster.in:676-731 /branches/PR-7529688/darwinbuild/darwinmaster.in:692-694 /branches/PR-7593824/darwinbuild/darwinmaster.in:739-772 /branches/PR-7598640/darwinbuild/darwinmaster.in:703-731 /branches/PR-7748469/darwinbuild/darwinmaster.in:777-785 /branches/PR-7765119/darwinbuild/darwinmaster.in:790-791 /branches/PR-7798586/darwinbuild/darwinmaster.in:796-799 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinmaster.in:632-650 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /branches/PR-6729491/darwinbuild/darwinmaster.in:655-664 /branches/PR-6973110/darwinbuild/darwinmaster.in:804-813 /branches/PR-7250612/darwinbuild/darwinmaster.in:635-650 /branches/PR-7341154/darwinbuild/darwinmaster.in:682-694 /branches/PR-7431723/darwinbuild/darwinmaster.in:660-664 /branches/PR-7461534/darwinbuild/darwinmaster.in:650-664 /branches/PR-7489777/darwinbuild/darwinmaster.in:676-731 /branches/PR-7529688/darwinbuild/darwinmaster.in:692-694 /branches/PR-7593824/darwinbuild/darwinmaster.in:739-772 /branches/PR-7598640/darwinbuild/darwinmaster.in:703-731 /branches/PR-7748469/darwinbuild/darwinmaster.in:777-785 /branches/PR-7765119/darwinbuild/darwinmaster.in:790-791 /branches/PR-7798586/darwinbuild/darwinmaster.in:796-799 /branches/PR-7935095/darwinbuild/darwinmaster.in:819-821 Property changes on: trunk/darwinbuild/installXcode.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6634286/darwinbuild/installXcode.in:632-650 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /branches/PR-6729491/darwinbuild/installXcode.in:655-664 /branches/PR-6973110/darwinbuild/installXcode.in:804-813 /branches/PR-7250612/darwinbuild/installXcode.in:635-650 /branches/PR-7341154/darwinbuild/installXcode.in:682-694 /branches/PR-7431723/darwinbuild/installXcode.in:660-664 /branches/PR-7461534/darwinbuild/installXcode.in:650-664 /branches/PR-7489777/darwinbuild/installXcode.in:676-731 /branches/PR-7529688/darwinbuild/installXcode.in:692-694 /branches/PR-7593824/darwinbuild/installXcode.in:739-772 /branches/PR-7598640/darwinbuild/installXcode.in:703-731 /branches/PR-7748469/darwinbuild/installXcode.in:777-785 /branches/PR-7765119/darwinbuild/installXcode.in:790-791 /branches/PR-7798586/darwinbuild/installXcode.in:796-799 + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6634286/darwinbuild/installXcode.in:632-650 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /branches/PR-6729491/darwinbuild/installXcode.in:655-664 /branches/PR-6973110/darwinbuild/installXcode.in:804-813 /branches/PR-7250612/darwinbuild/installXcode.in:635-650 /branches/PR-7341154/darwinbuild/installXcode.in:682-694 /branches/PR-7431723/darwinbuild/installXcode.in:660-664 /branches/PR-7461534/darwinbuild/installXcode.in:650-664 /branches/PR-7489777/darwinbuild/installXcode.in:676-731 /branches/PR-7529688/darwinbuild/installXcode.in:692-694 /branches/PR-7593824/darwinbuild/installXcode.in:739-772 /branches/PR-7598640/darwinbuild/installXcode.in:703-731 /branches/PR-7748469/darwinbuild/installXcode.in:777-785 /branches/PR-7765119/darwinbuild/installXcode.in:790-791 /branches/PR-7798586/darwinbuild/installXcode.in:796-799 /branches/PR-7935095/darwinbuild/installXcode.in:819-821 Property changes on: trunk/darwinbuild/packageRoots.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/packageRoots.in:632-650 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /branches/PR-6729491/darwinbuild/packageRoots.in:655-664 /branches/PR-6973110/darwinbuild/packageRoots.in:804-813 /branches/PR-7250612/darwinbuild/packageRoots.in:635-650 /branches/PR-7341154/darwinbuild/packageRoots.in:682-694 /branches/PR-7431723/darwinbuild/packageRoots.in:660-664 /branches/PR-7461534/darwinbuild/packageRoots.in:650-664 /branches/PR-7489777/darwinbuild/packageRoots.in:676-731 /branches/PR-7529688/darwinbuild/packageRoots.in:692-694 /branches/PR-7593824/darwinbuild/packageRoots.in:739-772 /branches/PR-7598640/darwinbuild/packageRoots.in:703-731 /branches/PR-7748469/darwinbuild/packageRoots.in:777-785 /branches/PR-7765119/darwinbuild/packageRoots.in:790-791 /branches/PR-7798586/darwinbuild/packageRoots.in:796-799 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/packageRoots.in:632-650 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /branches/PR-6729491/darwinbuild/packageRoots.in:655-664 /branches/PR-6973110/darwinbuild/packageRoots.in:804-813 /branches/PR-7250612/darwinbuild/packageRoots.in:635-650 /branches/PR-7341154/darwinbuild/packageRoots.in:682-694 /branches/PR-7431723/darwinbuild/packageRoots.in:660-664 /branches/PR-7461534/darwinbuild/packageRoots.in:650-664 /branches/PR-7489777/darwinbuild/packageRoots.in:676-731 /branches/PR-7529688/darwinbuild/packageRoots.in:692-694 /branches/PR-7593824/darwinbuild/packageRoots.in:739-772 /branches/PR-7598640/darwinbuild/packageRoots.in:703-731 /branches/PR-7748469/darwinbuild/packageRoots.in:777-785 /branches/PR-7765119/darwinbuild/packageRoots.in:790-791 /branches/PR-7798586/darwinbuild/packageRoots.in:796-799 /branches/PR-7935095/darwinbuild/packageRoots.in:819-821 Property changes on: trunk/darwinbuild/thinPackages.in ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/thinPackages.in:632-650 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /branches/PR-6729491/darwinbuild/thinPackages.in:655-664 /branches/PR-6973110/darwinbuild/thinPackages.in:804-813 /branches/PR-7250612/darwinbuild/thinPackages.in:635-650 /branches/PR-7341154/darwinbuild/thinPackages.in:682-694 /branches/PR-7431723/darwinbuild/thinPackages.in:660-664 /branches/PR-7461534/darwinbuild/thinPackages.in:650-664 /branches/PR-7489777/darwinbuild/thinPackages.in:676-731 /branches/PR-7529688/darwinbuild/thinPackages.in:692-694 /branches/PR-7593824/darwinbuild/thinPackages.in:739-772 /branches/PR-7598640/darwinbuild/thinPackages.in:703-731 /branches/PR-7748469/darwinbuild/thinPackages.in:777-785 /branches/PR-7765119/darwinbuild/thinPackages.in:790-791 /branches/PR-7798586/darwinbuild/thinPackages.in:796-799 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/thinPackages.in:632-650 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /branches/PR-6729491/darwinbuild/thinPackages.in:655-664 /branches/PR-6973110/darwinbuild/thinPackages.in:804-813 /branches/PR-7250612/darwinbuild/thinPackages.in:635-650 /branches/PR-7341154/darwinbuild/thinPackages.in:682-694 /branches/PR-7431723/darwinbuild/thinPackages.in:660-664 /branches/PR-7461534/darwinbuild/thinPackages.in:650-664 /branches/PR-7489777/darwinbuild/thinPackages.in:676-731 /branches/PR-7529688/darwinbuild/thinPackages.in:692-694 /branches/PR-7593824/darwinbuild/thinPackages.in:739-772 /branches/PR-7598640/darwinbuild/thinPackages.in:703-731 /branches/PR-7748469/darwinbuild/thinPackages.in:777-785 /branches/PR-7765119/darwinbuild/thinPackages.in:790-791 /branches/PR-7798586/darwinbuild/thinPackages.in:796-799 /branches/PR-7935095/darwinbuild/thinPackages.in:819-821 Modified: trunk/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinbuild.xcodeproj/project.pbxproj 2010-05-03 21:36:14 UTC (rev 822) @@ -3475,6 +3475,7 @@ buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INSTALL_PATH = "$(BINDIR)"; + PREFIX = /usr; PRODUCT_NAME = darwinup; }; name = Release; Modified: trunk/darwinup/Archive.cpp =================================================================== --- trunk/darwinup/Archive.cpp 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinup/Archive.cpp 2010-05-03 21:36:14 UTC (rev 822) @@ -327,7 +327,9 @@ archive = new TarArchive(actpath); } else if (has_suffix(actpath, ".tar.gz") || has_suffix(actpath, ".tgz")) { archive = new TarGZArchive(actpath); - } else if (has_suffix(actpath, ".tar.bz2") || has_suffix(actpath, ".tbz2")) { + } else if (has_suffix(actpath, ".tar.bz2") + || has_suffix(actpath, ".tbz2") + || has_suffix(actpath, ".tbz")) { archive = new TarBZ2Archive(actpath); #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 } else if (has_suffix(actpath, ".xar")) { Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/darwinup/Depot.cpp 2010-05-03 21:36:14 UTC (rev 822) @@ -672,7 +672,9 @@ res = 1; } } else { - fprintf(stdout, "Archive not found: %s\n", path); + fprintf(stdout, "Error: unable to load \"%s\". Either the path is invalid or" + " the file is in an unknown format.\n", path); + return -1; } return res; Modified: trunk/testing/darwinup/run-tests.sh =================================================================== --- trunk/testing/darwinup/run-tests.sh 2010-05-03 19:06:30 UTC (rev 821) +++ trunk/testing/darwinup/run-tests.sh 2010-05-03 21:36:14 UTC (rev 822) @@ -241,6 +241,19 @@ echo "DIFF: diffing original test files to dest (should be no diffs) ..." $DIFF $ORIG $DEST 2>&1 +echo "========== TEST: Try to upgrade with non-existent file =============" +$DARWINUP install $PREFIX/root5 +mv $PREFIX/root5 $PREFIX/root5.tmp +set +e +$DARWINUP upgrade $PREFIX/root5 +set -e +C=$($DARWINUP list | grep root5 | wc -l | xargs) +test "$C" == "1" +mv $PREFIX/root5.tmp $PREFIX/root5 +$DARWINUP uninstall oldest +echo "DIFF: diffing original test files to dest (should be no diffs) ..." +$DIFF $ORIG $DEST 2>&1 + echo "========== TEST: Superseded =============" $DARWINUP install $PREFIX/root5 $DARWINUP install $PREFIX/root6