From f9f8a8f56ecde660fe4455efae7535619212d0da Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 15 Jun 2014 17:04:46 +0200
Subject: [PATCH] pkgman: Update some user messages

---
 src/bin/pkgman/PackageManager.cpp  | 11 ++++++++---
 src/bin/pkgman/command_install.cpp |  4 +++-
 src/bin/pkgman/command_update.cpp  |  3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/bin/pkgman/PackageManager.cpp b/src/bin/pkgman/PackageManager.cpp
index 537c7e2684..6a5e6add51 100644
--- a/src/bin/pkgman/PackageManager.cpp
+++ b/src/bin/pkgman/PackageManager.cpp
@@ -267,9 +267,14 @@ PackageManager::_PrintResult(InstalledRepository& installationRepository)
 
 	for (int32 i = 0; BSolverPackage* package = packagesToActivate.ItemAt(i);
 		i++) {
-		printf("    install package %s from repository %s\n",
-			package->Info().FileName().String(),
-			package->Repository()->Name().String());
+		if (dynamic_cast<MiscLocalRepository*>(package->Repository()) == NULL) {
+			printf("    install package %s from repository %s\n",
+				package->Info().FileName().String(),
+				package->Repository()->Name().String());
+		} else {
+			printf("    install package %s from local file\n",
+				package->Info().FileName().String());
+		}
 	}
 
 	for (int32 i = 0; BSolverPackage* package = packagesToDeactivate.ItemAt(i);
diff --git a/src/bin/pkgman/command_install.cpp b/src/bin/pkgman/command_install.cpp
index 7e4ba58a6f..6358d9d879 100644
--- a/src/bin/pkgman/command_install.cpp
+++ b/src/bin/pkgman/command_install.cpp
@@ -29,7 +29,9 @@ static const char* const kShortUsage =
 
 static const char* const kLongUsage =
 	"Usage: %program% %command% <package> ...\n"
-	"Installs the specified packages.\n"
+	"Installs the specified packages. A <package> argument can be a search\n"
+	"string by which the package is looked up in a remote repository or a\n"
+	"path to a local package file. In the latter case the file is copied.\n"
 	"\n"
 	"Options:\n"
 	"  -H, --home\n"
diff --git a/src/bin/pkgman/command_update.cpp b/src/bin/pkgman/command_update.cpp
index 62f3641b0d..0bdfa311dd 100644
--- a/src/bin/pkgman/command_update.cpp
+++ b/src/bin/pkgman/command_update.cpp
@@ -31,6 +31,9 @@ static const char* const kLongUsage =
 	"Usage: %program% %command% [ <package> ... ]\n"
 	"Updates the specified packages. If no packages are given, all packages\n"
 	"in the installation location are updated.\n"
+	"A <package> argument can be a search string by which the package is\n"
+	"looked up locally and in a remote repository or a path to a local\n"
+	"package file. In the latter case the file is copied.\n"
 	"\n"
 	"Options:\n"
 	"  -H, --home\n"