use a common style to show missing or already-installed ports (FS#1843)

i3-softdeps.md: slight rewording

doc/i3-softdeps.md

@@ -81,8 +81,8 @@ present state. That nobody bothered to propose such a dup is a clear indication
 that we are not going back to non-fluid Pkgfiles anytime soon. So either our 
 Pkgfiles have irrevocably become "just a bit" more complex (and therefore no 
 longer "simple"), or they are in fact the simplest way to accommodate the modern 
-software landscape. In the latter case, a KISS objection to any new logic in 
-prt-get is hypocritical. In the former case, it could be argued that two 
+software landscape. In the latter case, a KISS objection to the corresponding 
+logic in prt-get is hypocritical. In the former case, it could be argued that two 
 wrongs do not make a right, and the trend away from KISS Pkgfiles does not 
 justify making prt-get "just a bit" more complex. But then we would have an 
 awkward mismatch between the capabilities of prt-get, and the ports that it 

src/installtransaction.cpp

@@ -159,8 +159,9 @@ InstallTransaction::install( const ArgParser* parser )
 		} else if ( (! m_config->preferHigher())
 				|| parser->strictDiff() 
 				|| rpDiff == VersionComparator::GREATER 
-				|| parser->pkgmkArgs().find(forceRebuild) !=
-				string::npos ) {
+		|| ( parser->pkgmkArgs().find(forceRebuild) != string::npos &&
+		find(parser->otherArgs().begin(), parser->otherArgs().end(),
+			it->first) != parser->otherArgs().end() ) ) {
 			update = true;
 		} else {
 			continue;
@@ -334,7 +335,9 @@ const {
         stat((portdir + "/Pkgfile").c_str(), &fstatData) == 0) {
 	    time_t pkgMtime = statData.st_mtime;
 	    time_t pfMtime = fstatData.st_mtime;
-	    if ( difftime(pkgMtime,pfMtime) > 0 ) { cmd = "/bin/true"; }
+	    if ( ( difftime(pkgMtime,pfMtime) > 0 ) and 
+	    (parser->pkgmkArgs().find("-fr") == string::npos) ) { 
+		    cmd = "/bin/true"; }
     }
 
     string args = "-d " + parser->pkgmkArgs();
@@ -378,7 +381,7 @@ const {
     if (update) {
         string from = m_pkgDB->getPackageVersion(package->name());
         string to = m_repo->getPackageVersion(package->name());
-        if (from ==  to) {
+        if (from == to) {
             summary = commandName + ": " + "reinstalling " +
                 package->name() + " " + to;
         } else {
@@ -647,9 +650,8 @@ bool InstallTransaction::calcDependencies( )
 
     if ( validPackages and (!calculateDependencies()) ) {
         cout << "Could not resolve dependencies for this transaction" << endl;
-        return false;
     }
-    return true;
+    return validPackages;
 }
 
 const list<string>& InstallTransaction::ignoredPackages() const

src/prtget.cpp

@@ -568,7 +568,18 @@ void PrtGet::install( bool dependencies ) {
 	// early exit when dependencies cannot be satisfied
 	if (!depck) { return; }
 
-        const list<string>& deps = depTransaction.dependencies();
+        list<string> deps = depTransaction.dependencies();
+	const list< pair<string,string> >& depMissing = depTransaction.missing();
+	list< pair<string,string> >::const_iterator it = depMissing.begin();
+
+	// ensure that missing ports are retained for the 
+	// post-transaction summary (FS#1843). Exempt any ports that were
+	// installed manually or from repos that have since been deactivated.
+	for (; it != depMissing.end(); ++it) {
+	    if (! m_pkgDB->isInstalled(it->first)) {
+		    deps.push_back(it->first);
+	    }
+	}
 
         InstallTransaction transaction( deps, m_repo, m_pkgDB, m_config );
         executeTransaction( transaction );
@@ -950,7 +961,7 @@ void PrtGet::evaluateResult( InstallTransaction& transaction,
     }
 
     const list<string>& already = transaction.alreadyInstalledPackages();
-    if ( already.size() && ! m_parser->depSort() ) {
+    if ( already.size() ) {
         cout << endl << "-- Packages installed before this run (ignored)"
              << endl;
         list<string>::const_iterator ait = already.begin();
@@ -1034,7 +1045,7 @@ void PrtGet::evaluateResult( InstallTransaction& transaction,
 
     cout << endl;
 
-    if ( errors == 0 && !interrupted ) {
+    if ( inst.size() && errors == 0 && !interrupted ) {
         cout << "prt-get: install successful." << endl;
     } else {
         m_returnValue = PG_PARTIAL_INSTALL_ERROR;