Merge pull request #1476 from irhndt/main

stgraber · web-flow · commit 06ff4036a463 · 2024-12-11T01:06:07.000-05:00
incus/project: Fix handling of default (unset) project in `get-current`
diff --git a/cmd/incus/project.go b/cmd/incus/project.go
@@ -1185,6 +1185,11 @@ func (c *cmdProjectGetCurrent) Run(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf(i18n.G("Remote %s doesn't exist"), conf.DefaultRemote)
 	}
 
-	fmt.Println(remote.Project)
+	if remote.Project == "" {
+		fmt.Println(api.ProjectDefaultName)
+	} else {
+		fmt.Println(remote.Project)
+	}
+
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1185,6 +1185,11 @@ func (c cmdProjectGetCurrent) Run(cmd cobra.Command, args []string) error {`
`1185`	`1185`	`return fmt.Errorf(i18n.G("Remote %s doesn't exist"), conf.DefaultRemote)`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`		`- fmt.Println(remote.Project)`
	`1188`	`+ if remote.Project == "" {`
	`1189`	`+ fmt.Println(api.ProjectDefaultName)`
	`1190`	`+ } else {`
	`1191`	`+ fmt.Println(remote.Project)`
	`1192`	`+ }`
	`1193`	`+`
`1189`	`1194`	`return nil`
`1190`	`1195`	`}`