newt: Print external repos with info command

newt/cli/project_cmds.go

@@ -34,6 +34,7 @@ import (
 )
 
 var infoRemote bool
+var infoExternal bool
 
 func newRunCmd(cmd *cobra.Command, args []string) {
 	if len(args) < 1 {
@@ -148,11 +149,9 @@ func infoRunCmd(cmd *cobra.Command, args []string) {
 
 	// If no arguments specified, print status of all installed repos.
 	if len(args) == 0 {
-		pred := func(r *repo.Repo) bool { return true }
-		if err := proj.InfoIf(pred, infoRemote); err != nil {
+		if err := proj.Info(infoRemote, infoExternal); err != nil {
 			NewtUsage(nil, err)
 		}
-
 		return
 	}
 
@@ -243,7 +242,10 @@ func AddProjectCommands(cmd *cobra.Command) {
 	}
 	infoCmd.PersistentFlags().BoolVarP(&infoRemote,
 		"remote", "r", false,
-		"Fetch latest repos to determine if upgrades are required")
+		"Fetch latest repos to determine if upgrades are required. Works only on internal repositories.")
+	infoCmd.PersistentFlags().BoolVarP(&infoExternal,
+		"external", "e", false,
+		"Include external repositories.")
 
 	cmd.AddCommand(infoCmd)
 }

newt/install/install.go

@@ -679,7 +679,6 @@ func (inst *Installer) Info(repos []*repo.Repo, remote bool) error {
 		vmp = &vm
 	}
 
-	util.StatusMessage(util.VERBOSITY_DEFAULT, "Repository info:\n")
 	for _, r := range repos {
 		if r.IsLocal() {
 			inst.localRepoInfo(r)

newt/project/project.go

@@ -411,9 +411,7 @@ func (proj *Project) UpgradeIf(
 	return inst.Upgrade(specifiedRepoList, force, ask)
 }
 
-func (proj *Project) InfoIf(predicate func(r *repo.Repo) bool,
-	remote bool) error {
-
+func (proj *Project) Info(remote bool, external bool) error {
 	if remote {
 		// Make sure we have an up to date copy of all `repository.yml` files.
 		if err := proj.downloadRepositoryYmlFiles(); err != nil {
@@ -422,15 +420,39 @@ func (proj *Project) InfoIf(predicate func(r *repo.Repo) bool,
 	}
 
 	// Determine which repos the user wants info about.
-	repoList := proj.SelectRepos(predicate)
+	predicate := func(r *repo.Repo) bool { return true }
+	internalRepos := proj.SelectRepos(predicate)
+
+	if !remote && external {
+		proj.GetPkgRepos()
+	}
+
+	predicate = func(r *repo.Repo) bool {
+		for _, intRepo := range internalRepos {
+			if intRepo.Name() == r.Name() {
+				return false
+			}
+		}
+		return true
+	}
+	// This should be empty slice if remote is true
+	externalRepos := proj.SelectRepos(predicate)
 
 	// Ignore errors.  We will deal with bad repos individually when we display
 	// info about them.
 	inst, _ := install.NewInstaller(proj.repos, proj.rootRepoReqs)
-	if err := inst.Info(repoList, remote); err != nil {
+	util.StatusMessage(util.VERBOSITY_DEFAULT, "Internal repository info:\n")
+	if err := inst.Info(internalRepos, remote); err != nil {
 		return err
 	}
 
+	if !remote && external {
+		util.StatusMessage(util.VERBOSITY_DEFAULT, "External repository info:\n")
+		if err := inst.Info(externalRepos, remote); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }