cmd/cue: fix cue import -p
Fixes #301
Change-Id: I622d2e95559b19b63df36ddb1a23651a1c34577e
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/5202
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/cmd/cue/cmd/orphans.go b/cmd/cue/cmd/orphans.go
index b6edfe4..a168c7d 100644
--- a/cmd/cue/cmd/orphans.go
+++ b/cmd/cue/cmd/orphans.go
@@ -51,7 +51,7 @@
if pkg == "" {
pkg = i.PkgName
- } else if pkg != "" && i.PkgName != pkg && !flagForce.Bool(b.cmd) {
+ } else if pkg != "" && i.PkgName != "" && i.PkgName != pkg && !flagForce.Bool(b.cmd) {
return false, fmt.Errorf(
"%q flag clashes with existing package name (%s vs %s)",
flagPackage, pkg, i.PkgName,
diff --git a/cmd/cue/cmd/testdata/script/import_dir.txt b/cmd/cue/cmd/testdata/script/import_dir.txt
new file mode 100644
index 0000000..f4fd672
--- /dev/null
+++ b/cmd/cue/cmd/testdata/script/import_dir.txt
@@ -0,0 +1,9 @@
+cue import -p foo ./...
+cmp x.cue expect.cue
+
+-- x.yml --
+x: yyy
+-- expect.cue --
+package foo
+
+x: "yyy"
