Merge remote-tracking branch 'origin/release-v1.0'

* origin/release-v1.0: Releases no longer *have* to be release candidates. CmdLine: List of opens on a too many options kraken formatted more nicely.
KSP-CKAN · Nov 14, 2014 · cb731cb · cb731cb
2 parents 19c8659 + d169ede
commit cb731cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CKAN/CmdLine/Main.cs b/CKAN/CmdLine/Main.cs
@@ -409,9 +409,11 @@ private static int Install(InstallOptions options)
 
                 foreach (CkanModule mod in ex.modules)
                 {
-                    User.WriteLine("* {0}", mod.identifier);
+                    User.WriteLine("* {0} ({1})", mod.identifier, mod.name);
                 }
 
+                User.WriteLine(""); // Looks tidier.
+
                 return Exit.ERROR;
             }
             catch (FileExistsKraken ex)

diff --git a/CKAN/Tests/CKAN/Meta.cs b/CKAN/Tests/CKAN/Meta.cs
@@ -36,7 +36,7 @@ public void ReleaseNumber()
             // release candidates.
 
             Assert.IsTrue(
-                Regex.IsMatch(version.ToString(), @"^v(?:0.\d+|\d+\.\d+\.\d+(?:-RC\d+))$"),
+                Regex.IsMatch(version.ToString(), @"^v(?:0.\d+|\d+\.\d+\.\d+(?:-RC\d+)?)$"),
                 version.ToString());
         }
     }