interfaces: improvements to error messages

snapcore · Jun 2, 2020 · 9c307da · 9c307da
1 parent 1c5533b
commit 9c307da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/interfaces/dbus/backend.go b/interfaces/dbus/backend.go
@@ -354,7 +354,7 @@ func BusNameOwner(bus, name string) (owner string, err error) {
 	case "system":
 		servicesDir = dirs.SnapDBusSystemServicesDir
 	default:
-		panic(bus)
+		return "", fmt.Errorf("unknown D-Bus bus %q", bus)
 	}
 	serviceFile := filepath.Join(servicesDir, name+".service")
 	return snapNameFromServiceFile(serviceFile)

diff --git a/wrappers/services.go b/wrappers/services.go
@@ -723,7 +723,7 @@ WantedBy={{.ServicesTarget}}
 	if appInfo.Daemon == "dbus" && len(appInfo.ActivatesOn) > 0 {
 		slot := appInfo.Slots[appInfo.ActivatesOn[len(appInfo.ActivatesOn)-1]]
 		if err := slot.Attr("name", &busName); err != nil {
-			logger.Noticef("could not get 'name' attribute of dbus slot %q: %v", slot.Name, err)
+			logger.Noticef("Cannot get 'name' attribute of dbus slot %q: %v", slot.Name, err)
 		}
 	}