Revision

820

Author

wsiegrist@apple.com

Date

2010-05-03 11:54:57 -0700 (Mon, 03 May 2010)

Log Message

Add .tbz as a valid TarBZ2 suffix. Improve error message when darwinup does not understand the target file format.

Modified Paths

• branches/PR-7935095/darwinup/Archive.cpp
• branches/PR-7935095/darwinup/Depot.cpp

Diff

--- branches/PR-7935095/darwinup/Archive.cpp	2010-05-03 18:44:56 UTC (rev 819)
+++ branches/PR-7935095/darwinup/Archive.cpp	2010-05-03 18:54:57 UTC (rev 820)
@@ -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")) {

--- branches/PR-7935095/darwinup/Depot.cpp	2010-05-03 18:44:56 UTC (rev 819)
+++ branches/PR-7935095/darwinup/Depot.cpp	2010-05-03 18:54:57 UTC (rev 820)
@@ -672,7 +672,8 @@
 			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;
 	}