From 62423866b0e1e5474693ff95036e40ea99bfdbdd Mon Sep 17 00:00:00 2001
From: Reagan Lopez <reagan.lopez@intel.com>
Date: Fri, 13 Dec 2019 12:41:51 -0800
Subject: [PATCH] repo: Fix message while removing repo

Currently, `mixer repo remove` displays incorrect messages if repo does
not exist.

This fix displays the correct message.

Signed-off-by: Reagan Lopez <reagan.lopez@intel.com>
---
 builder/repo_control.go | 11 +++++++++--
 mixer/cmd/repos.go      |  1 -
 mixin/repo.go           |  1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/builder/repo_control.go b/builder/repo_control.go
index ff15dd9..cc87a3a 100644
--- a/builder/repo_control.go
+++ b/builder/repo_control.go
@@ -287,11 +287,18 @@ func (b *Builder) RemoveRepo(name string) error {
 
 	_, err = DNFConf.GetSection(name)
 	if err != nil {
-		fmt.Printf("Repo %s does not exist.\n", name)
+		return errors.Errorf("unable to remove repo %s, does not exist.", name)
 	}
 
 	DNFConf.DeleteSection(name)
-	return DNFConf.SaveTo(b.Config.Builder.DNFConf)
+
+	err = DNFConf.SaveTo(b.Config.Builder.DNFConf)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Removing repo %s\n", name)
+	return nil
 }
 
 // ListRepos lists all configured repositories in the DNF configuration file.
diff --git a/mixer/cmd/repos.go b/mixer/cmd/repos.go
index 8988398..76d0517 100644
--- a/mixer/cmd/repos.go
+++ b/mixer/cmd/repos.go
@@ -131,7 +131,6 @@ func runRemoveRepo(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	fmt.Printf("Removed %s repo.\n", args[0])
 }
 
 func runListRepos(cmd *cobra.Command, args []string) {
diff --git a/mixin/repo.go b/mixin/repo.go
index 8ead040..4979768 100644
--- a/mixin/repo.go
+++ b/mixin/repo.go
@@ -151,7 +151,6 @@ func runRemoveRepo(cmd *cobra.Command, args []string) {
 	if err != nil {
 		fail(err)
 	}
-	fmt.Printf("Removed %s repo.\n", args[0])
 }
 
 func runListRepos(cmd *cobra.Command, args []string) {