From e4d5098bb00064b3f4e8bc32c956ccb9996f3faa Mon Sep 17 00:00:00 2001
From: Johannes Winkelmann <jw@smts.ch>
Date: Tue, 4 Apr 2006 18:50:25 +0000
Subject: [PATCH] prt-get: print nice summary before running addcommand (-v for
 details)

git-svn-id: https://crux.nu/svn/tools/prt-get/trunk@1141 0b5ae1c7-2405-0410-a7fc-ba219f786e1e
---
 ChangeLog                  |  2 ++
 src/installtransaction.cpp | 29 ++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49303a1..6f39bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 - unlock ports on remove
 - fix lock: previously locking would only work for ports in the ports tree
 - allow to remove log files of successful builds
+- print update summary right before running the addcommand
+- print full add command and PACKAGE_DIR info when using install/update -v
 
 * 0.5.11	29.05.2005  Johannes Winkelmann
 - add --path to 'ls'
diff --git a/src/installtransaction.cpp b/src/installtransaction.cpp
index 3e0f689..e75d1b8 100644
--- a/src/installtransaction.cpp
+++ b/src/installtransaction.cpp
@@ -268,8 +268,10 @@ InstallTransaction::installPackage( const Package* package,
         if ( pkgdest != "" ) {
             // TODO: don't manipulate pkgdir
             pkgdir = pkgdest;
-            string message = "Using PKGMK_PACKAGE_DIR: " + pkgdir;
-            cout << message << endl;
+            string message = "prt-get: Using PKGMK_PACKAGE_DIR: " + pkgdir;
+            if (parser->verbose() > 0) {
+                cout << message << endl;
+            }
             if ( m_config->writeLog() ) {
                 write( fdlog, message.c_str(), message.length() );
                 write( fdlog, "\n", 1 );
@@ -307,10 +309,27 @@ InstallTransaction::installPackage( const Package* package,
                 commandName = "prt-cache";
             }
 
-            string message = commandName + ": " + cmd + " " + args;
-            cout << message << endl;
+            // - inform the user about what's happening
+            string fullCommand = commandName + ": " + cmd + " " + args;
+            string summary;
+            if (update) {
+                summary = commandName + ": " + "updating " + package->name() +
+                    " from " + m_pkgDB->getPackageVersion(package->name()) +
+                    " to " + package->version() + "-" + package->release();
+            } else {
+                summary = commandName + ": " + "installing " + 
+                    package->name() + " " +
+                    package->version() + "-" + package->release();
+            }                       
+            
+            // - print and log
+            cout << summary << endl;
+            if (parser->verbose() > 0) {
+                cout << fullCommand << endl;
+            }
             if ( m_config->writeLog() ) {
-                write( fdlog, message.c_str(), message.length() );
+                write( fdlog, summary.c_str(), summary.length() );
+                write( fdlog, fullCommand.c_str(), fullCommand.length() );
                 write( fdlog, "\n", 1 );
             }