From ac7bf6eb198a7ccdaebb9bd152551deccaf0a975 Mon Sep 17 00:00:00 2001
From: Lin Yihai <linyihai@huawei.com>
Date: Thu, 11 Apr 2024 15:35:56 +0800
Subject: [PATCH 1/2] test(package): `cargo package -p doesnt-exist` will
 package all packages in workspace

---
 tests/testsuite/package.rs | 64 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
index 860d69627..08662f1f9 100644
--- a/tests/testsuite/package.rs
+++ b/tests/testsuite/package.rs
@@ -2618,6 +2618,70 @@ src/main.rs
     p.cargo("package --allow-dirty").run();
 }
 
+#[cargo_test]
+fn package_in_workspace_not_found() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+                [workspace]
+                members = ["bar", "baz"]
+            "#,
+        )
+        .file("src/main.rs", "fn main() {}")
+        .file(
+            "bar/Cargo.toml",
+            r#"
+                [package]
+                name = "bar"
+                version = "0.0.1"
+                edition = "2015"
+                authors = []
+                license = "MIT"
+                description = "bar"
+            "#,
+        )
+        .file("bar/src/main.rs", "fn main() {}")
+        .file(
+            "baz/Cargo.toml",
+            r#"
+                [package]
+                name = "baz"
+                version = "0.0.1"
+                edition = "2015"
+                authors = []
+                license = "MIT"
+                description = "baz"
+            "#,
+        )
+        .file("baz/src/main.rs", "fn main() {}")
+        .build();
+
+    p.cargo("package -p doesnt-exist")
+        .with_stderr(
+            "\
+[WARNING] manifest has no documentation, [..]
+See [..]
+[PACKAGING] bar v0.0.1 ([CWD]/bar)
+[VERIFYING] bar v0.0.1 ([CWD]/bar)
+[COMPILING] bar v0.0.1 ([CWD][..])
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
+[PACKAGED] [..] files, [..] ([..] compressed)
+[WARNING] manifest has no documentation, [..]
+See [..]
+[PACKAGING] baz v0.0.1 ([CWD]/baz)
+[VERIFYING] baz v0.0.1 ([CWD]/baz)
+[COMPILING] baz v0.0.1 ([CWD][..])
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
+[PACKAGED] [..] files, [..] ([..] compressed)
+",
+        )
+        .run();
+
+    assert!(p.root().join("target/package/bar-0.0.1.crate").is_file());
+    assert!(p.root().join("target/package/baz-0.0.1.crate").is_file());
+}
+
 #[cargo_test]
 fn in_workspace() {
     let p = project()

From decbadb36f54048f8ddee5a3adf04e8e83b86a7d Mon Sep 17 00:00:00 2001
From: Lin Yihai <linyihai@huawei.com>
Date: Thu, 11 Apr 2024 15:49:33 +0800
Subject: [PATCH 2/2] fix: `cargo package -p` includes all packages if no match
 is found

---
 src/cargo/ops/cargo_package.rs | 15 ++++++++++-----
 tests/testsuite/package.rs     | 21 +++------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index a699e58a6..1d63446ab 100644
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -10,7 +10,7 @@ use crate::core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor}
 use crate::core::manifest::Target;
 use crate::core::resolver::CliFeatures;
 use crate::core::{registry::PackageRegistry, resolver::HasDevUnits};
-use crate::core::{Feature, Shell, Verbosity, Workspace};
+use crate::core::{Feature, PackageIdSpecQuery, Shell, Verbosity, Workspace};
 use crate::core::{Package, PackageId, PackageSet, Resolve, SourceId};
 use crate::sources::PathSource;
 use crate::util::cache_lock::CacheLockMode;
@@ -176,10 +176,15 @@ pub fn package_one(
 }
 
 pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult<Option<Vec<FileLock>>> {
-    let pkgs = ws.members_with_features(
-        &opts.to_package.to_package_id_specs(ws)?,
-        &opts.cli_features,
-    )?;
+    let specs = &opts.to_package.to_package_id_specs(ws)?;
+    // If -p is used, we should check spec is matched with the members (See #13719)
+    if let ops::Packages::Packages(_) = opts.to_package {
+        for spec in specs.iter() {
+            let member_ids = ws.members().map(|p| p.package_id());
+            spec.query(member_ids)?;
+        }
+    }
+    let pkgs = ws.members_with_features(specs, &opts.cli_features)?;
 
     let mut dsts = Vec::with_capacity(pkgs.len());
 
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
index 08662f1f9..a89075241 100644
--- a/tests/testsuite/package.rs
+++ b/tests/testsuite/package.rs
@@ -2658,28 +2658,13 @@ fn package_in_workspace_not_found() {
         .build();
 
     p.cargo("package -p doesnt-exist")
-        .with_stderr(
+        .with_status(101)
+        .with_stderr_contains(
             "\
-[WARNING] manifest has no documentation, [..]
-See [..]
-[PACKAGING] bar v0.0.1 ([CWD]/bar)
-[VERIFYING] bar v0.0.1 ([CWD]/bar)
-[COMPILING] bar v0.0.1 ([CWD][..])
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
-[PACKAGED] [..] files, [..] ([..] compressed)
-[WARNING] manifest has no documentation, [..]
-See [..]
-[PACKAGING] baz v0.0.1 ([CWD]/baz)
-[VERIFYING] baz v0.0.1 ([CWD]/baz)
-[COMPILING] baz v0.0.1 ([CWD][..])
-[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
-[PACKAGED] [..] files, [..] ([..] compressed)
+[ERROR] package ID specification `doesnt-exist` did not match any packages
 ",
         )
         .run();
-
-    assert!(p.root().join("target/package/bar-0.0.1.crate").is_file());
-    assert!(p.root().join("target/package/baz-0.0.1.crate").is_file());
 }
 
 #[cargo_test]