TBR: Revert "v.io/jiri: remove bogus check for old-style profiles"
This reverts commit 4a333e053616a1ab3f3078cb00eb85b1035dda38.
Change-Id: I91c65c407fc9c97b35a366748f00adc64bca663c
diff --git a/profiles/profilescmdline/manager_cmdline.go b/profiles/profilescmdline/manager_cmdline.go
index 9bbced4..9a25383 100644
--- a/profiles/profilescmdline/manager_cmdline.go
+++ b/profiles/profilescmdline/manager_cmdline.go
@@ -29,6 +29,7 @@
"flag"
"fmt"
"os"
+ "path/filepath"
"strings"
"v.io/jiri"
@@ -337,8 +338,12 @@
if !runSubcommands {
return nil
}
- cmds, _ := lookpath.LookPrefix(jirix.Env(), "jiri-profile-", nil)
- return cmds
+ fi, err := os.Stat(filepath.Join(jirix.Root, jiri.ProfilesDBDir))
+ if err == nil && fi.IsDir() {
+ cmds, _ := lookpath.LookPrefix(jirix.Env(), "jiri-profile-", nil)
+ return cmds
+ }
+ return nil
}
func allAvailableManagers(jirix *jiri.X) ([]string, error) {
diff --git a/profiles/profilescmdline/manager_test.go b/profiles/profilescmdline/manager_test.go
index a81385e..621bc39 100644
--- a/profiles/profilescmdline/manager_test.go
+++ b/profiles/profilescmdline/manager_test.go
@@ -135,6 +135,11 @@
t.Errorf("%v does not contain %v\n", got, want)
}
}
+ os.RemoveAll(filepath.Join(fake.X.Root, jiri.ProfilesDBDir))
+ stdout = run(sh, dir, "jiri", "profile", "available", "-v")
+ if got, want := strings.TrimSpace(stdout), "Available Subcommands:"; got != want {
+ t.Errorf("got %v, want %v", got, want)
+ }
}
func loc() string {
