Modified: svn:mergeinfo

Modified: svn:mergeinfo

Modified: svn:mergeinfo

Modified: svn:mergeinfo

Modified: svn:mergeinfo

Modified: svn:mergeinfo

Modified: trunk/darwinbuild.xcodeproj/project.pbxproj (821 => 822)

--- 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 (821 => 822)

--- 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 (821 => 822)

--- 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 (821 => 822)

--- 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