Improve some package upgrade related messages.

dlang · Jul 1, 2014 · c66ab6e · c66ab6e
1 parent 91f93b5
commit c66ab6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/source/dub/dependency.d b/source/dub/dependency.d
@@ -305,6 +305,7 @@ struct Dependency {
 		d.m_cmpB = !doCmp(m_cmpB, b,b)? m_cmpB : o.m_cmpB;
 		d.m_versB = b;
 		d.m_optional = m_optional && o.m_optional;
+		if (!d.valid) return INVALID;
 
 		return d;
 	}

diff --git a/source/dub/dub.d b/source/dub/dub.d
@@ -207,21 +207,25 @@ class Dub {
 		auto versions = resolver.resolve(m_project.rootPackage, m_project.selections);
 
 		if (options & UpgradeOptions.printUpgradesOnly) {
+			bool any = false;
 			foreach (p, ver; versions) {
 				if (!ver.path.empty) continue;
 
 				auto basename = getBasePackageName(p);
 				if (!m_project.selections.hasSelectedVersion(basename)) {
 					logInfo("Package %s can be installed with version %s.",
 						basename, ver);
+					any = true;
 					continue;
 				}
 				auto sver = m_project.selections.getSelectedVersion(basename);
 				if (!sver.path.empty) continue;
 				if (ver.version_ <= sver.version_) continue;
 				logInfo("Package %s can be upgraded from %s to %s.",
 					basename, sver, ver);
+				any = true;
 			}
+			if (any) logInfo("Use \"dub upgrade\" to perform those changes.");
 			return;
 		}
 
@@ -242,7 +246,7 @@ class Dub {
 			FetchOptions fetchOpts;
 			fetchOpts |= (options & UpgradeOptions.preRelease) != 0 ? FetchOptions.usePrerelease : FetchOptions.none;
 			fetchOpts |= (options & UpgradeOptions.forceRemove) != 0 ? FetchOptions.forceRemove : FetchOptions.none;
-			if (!pack) fetch(p, ver, defaultPlacementLocation, fetchOpts, "getting upgraded version");
+			if (!pack) fetch(p, ver, defaultPlacementLocation, fetchOpts, "getting selected version");
 			if ((options & UpgradeOptions.select) && ver.path.empty && p != m_project.rootPackage.name)
 				m_project.selections.selectVersion(p, ver.version_);
 		}