From cfd80cbd5d04e106f3f2e58fbb3906ac4e9fa5f8 Mon Sep 17 00:00:00 2001
From: Mrpanda-Developer <dylanmartijn@gmail.com>
Date: Thu, 3 Sep 2026 18:42:44 +0200
Subject: [PATCH 1/8] add comments feature in the metadata

---
 docs/metadata.md                          | 1 +
 src/installer/installer.rs                | 7 +++++++
 src/repositories/types/package.rs         | 4 ++++
 src/repositories/types/package_version.rs | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/docs/metadata.md b/docs/metadata.md
index ae415ce7..3d72d1c2 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -52,6 +52,7 @@ See the tables below for all different fields, look at [Target fields](#target-f
 | `use_<script>`                  | Needs to be set to true when the script should be used. (Only for `preinstall`, `postinstall` and `uninstall`) |
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. |
 | `revisions`                     | A list of strings containing a description of what changed in each metadata or script revision. |
+| `comments`                      | A list of messages shown before installing this package version.               |
 | `deprecation`                   | Defines when the version deprecates, disables and the reason.                  |
 | `script_args`                   | A table of key-value pairs containing arguments passed to scripts.             |
 | `external_test_files`           | A list of external test files that are needed for executing the test script. These files are automatically downloaded. |
diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 0fdacd35..0ed12fce 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -73,6 +73,13 @@ impl<'a> Installer<'a> {
         let (repository_id, package_metadata, version_metadata) =
             self.repository_manager.read_package_and_version(optional_id, &Target::current())?;
 
+        if let Some(message) = &package_metadata.install_message {
+            println!("{message}");
+        }
+        for comment in &version_metadata.comments {
+            println!("{comment}");
+        }
+
         // Create a package id of the current package
         let version = &version_metadata.version;
         let package_id = optional_id.versioned_or_cloned(version);
diff --git a/src/repositories/types/package.rs b/src/repositories/types/package.rs
index bb6670e1..3d6aa9f5 100644
--- a/src/repositories/types/package.rs
+++ b/src/repositories/types/package.rs
@@ -17,6 +17,10 @@ use crate::{
 pub struct PackageMeta {
     pub name: PackageName,
     pub description: String,
+
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub install_message: Option<String>,
+
     pub homepage: Option<String>,
     pub versions: Vec<Version>,
     pub required_packit_version: Option<Version>,
diff --git a/src/repositories/types/package_version.rs b/src/repositories/types/package_version.rs
index 1c5321e8..3bde9fb1 100644
--- a/src/repositories/types/package_version.rs
+++ b/src/repositories/types/package_version.rs
@@ -66,6 +66,9 @@ pub struct PackageVersionMeta {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub revisions: Vec<String>,
 
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub comments: Vec<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub deprecation: Option<DeprecationInfo>,
 

From 957b3e4cb6ec39b05dfcf8b3849dd2c381ec66fd Mon Sep 17 00:00:00 2001
From: Mrpanda-Developer <dylanmartijn@gmail.com>
Date: Sat, 5 Sep 2026 20:52:16 +0200
Subject: [PATCH 2/8] add global notice, instead of comments

---
 docs/metadata.md                          |  5 ++++-
 src/installer/installer.rs                | 18 ++++++++++--------
 src/register/package_register.rs          |  2 ++
 src/repositories/types/package.rs         |  3 ---
 src/repositories/types/package_target.rs  |  6 ++++++
 src/repositories/types/package_version.rs |  7 +++++--
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/docs/metadata.md b/docs/metadata.md
index 3d72d1c2..b26ad810 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -52,7 +52,8 @@ See the tables below for all different fields, look at [Target fields](#target-f
 | `use_<script>`                  | Needs to be set to true when the script should be used. (Only for `preinstall`, `postinstall` and `uninstall`) |
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. |
 | `revisions`                     | A list of strings containing a description of what changed in each metadata or script revision. |
-| `comments`                      | A list of messages shown before installing this package version.               |
+| `preinstall_notice`             | A message shown immediately before the preinstall step. A target-specific notice overrides this value. |
+| `postinstall_notice`            | A message shown immediately after the postinstall step. A target-specific notice overrides this value. |
 | `deprecation`                   | Defines when the version deprecates, disables and the reason.                  |
 | `script_args`                   | A table of key-value pairs containing arguments passed to scripts.             |
 | `external_test_files`           | A list of external test files that are needed for executing the test script. These files are automatically downloaded. |
@@ -138,6 +139,8 @@ Targets are specified as `[targets.<bounds>]`, where bounds specify the supporte
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. Overrides the value defined in the global field. |
 | `<script-type>_script`          | Defines the name of the script to use instead of the default script name.            |
 | `use_<script>`                  | Overwrites the global `use_<script>` field. (Only for `preinstall`, `postinstall` and `uninstall`) |
+| `preinstall_notice`             | Overrides the global preinstall notice for the target.                               |
+| `postinstall_notice`            | Overrides the global postinstall notice for the target.                              |
 | `script_args`                   | A table of key-value pairs containing arguments passed to scripts, additional to the args defined in the global field. |
 | `source`                        | Defines which source to use, required when multiple sources are defined.             |
 | `external_test_files`           | A list of external test files that are needed for executing the test script for this target, additional to the files specified in the global field. These files are automatically downloaded. |
diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 0ed12fce..12cae157 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -73,13 +73,6 @@ impl<'a> Installer<'a> {
         let (repository_id, package_metadata, version_metadata) =
             self.repository_manager.read_package_and_version(optional_id, &Target::current())?;
 
-        if let Some(message) = &package_metadata.install_message {
-            println!("{message}");
-        }
-        for comment in &version_metadata.comments {
-            println!("{comment}");
-        }
-
         // Create a package id of the current package
         let version = &version_metadata.version;
         let package_id = optional_id.versioned_or_cloned(version);
@@ -198,6 +191,11 @@ impl<'a> Installer<'a> {
 
         let version_meta = &install_meta.version_metadata;
         let script_args = version_meta.get_script_args(&install_meta.target_bounds)?;
+        let target_meta = version_meta.get_target(&install_meta.target_bounds)?;
+
+        if let Some(notice) = target_meta.preinstall_notice.as_ref().or(version_meta.preinstall_notice.as_ref()) {
+            println!("{notice}");
+        }
 
         self.execute_preinstall(&package_id, install_meta, &install_directory, &script_args)?;
 
@@ -241,8 +239,12 @@ impl<'a> Installer<'a> {
 
         self.execute_postinstall(&package_id, install_meta, &install_directory, &script_args)?;
 
+        if let Some(notice) = target_meta.postinstall_notice.as_ref().or(version_meta.postinstall_notice.as_ref()) {
+            println!("{notice}");
+        }
+
         // Get the target information from the package version info
-        let target = version_meta.get_target(&install_meta.target_bounds)?;
+        let target = target_meta;
 
         self.determine_active(install_meta, &package_id, target)?;
 
diff --git a/src/register/package_register.rs b/src/register/package_register.rs
index 21172d54..cf218059 100644
--- a/src/register/package_register.rs
+++ b/src/register/package_register.rs
@@ -522,6 +522,8 @@ pub mod tests {
             use_postinstall: None,
             use_uninstall: None,
             revisions: Vec::new(),
+            preinstall_notice: None,
+            postinstall_notice: None,
         }
     }
 
diff --git a/src/repositories/types/package.rs b/src/repositories/types/package.rs
index 3d6aa9f5..2e6d016f 100644
--- a/src/repositories/types/package.rs
+++ b/src/repositories/types/package.rs
@@ -18,9 +18,6 @@ pub struct PackageMeta {
     pub name: PackageName,
     pub description: String,
 
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub install_message: Option<String>,
-
     pub homepage: Option<String>,
     pub versions: Vec<Version>,
     pub required_packit_version: Option<Version>,
diff --git a/src/repositories/types/package_target.rs b/src/repositories/types/package_target.rs
index 8e1b1208..ff54f7f5 100644
--- a/src/repositories/types/package_target.rs
+++ b/src/repositories/types/package_target.rs
@@ -33,6 +33,12 @@ pub struct PackageTarget {
     pub test_script: Option<Script>,
     pub uninstall_script: Option<Script>,
 
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub preinstall_notice: Option<String>,
+
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub postinstall_notice: Option<String>,
+
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub use_preinstall: Option<bool>,
 
diff --git a/src/repositories/types/package_version.rs b/src/repositories/types/package_version.rs
index 3bde9fb1..97620ea1 100644
--- a/src/repositories/types/package_version.rs
+++ b/src/repositories/types/package_version.rs
@@ -66,8 +66,11 @@ pub struct PackageVersionMeta {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub revisions: Vec<String>,
 
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub comments: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub preinstall_notice: Option<String>,
+
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub postinstall_notice: Option<String>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub deprecation: Option<DeprecationInfo>,

From a7decb8755925f849f419d55c456dcbc59b1baf2 Mon Sep 17 00:00:00 2001
From: Mrpanda-Developer <dylanmartijn@gmail.com>
Date: Sun, 6 Sep 2026 13:35:13 +0200
Subject: [PATCH 3/8] added the requested changes to the comments

---
 docs/metadata.md           | 4 ++--
 src/installer/installer.rs | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/docs/metadata.md b/docs/metadata.md
index b26ad810..e944e030 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -139,8 +139,8 @@ Targets are specified as `[targets.<bounds>]`, where bounds specify the supporte
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. Overrides the value defined in the global field. |
 | `<script-type>_script`          | Defines the name of the script to use instead of the default script name.            |
 | `use_<script>`                  | Overwrites the global `use_<script>` field. (Only for `preinstall`, `postinstall` and `uninstall`) |
-| `preinstall_notice`             | Overrides the global preinstall notice for the target.                               |
-| `postinstall_notice`            | Overrides the global postinstall notice for the target.                              |
+| `preinstall_notice`             | If a notice is present on both the version and the target, both notices are shown, with the version notice first and the target-specific notice after it.|
+| `postinstall_notice`            | If a notice is present on both the version and the target, both notices are shown, with the version notice first and the target-specific notice after it.|
 | `script_args`                   | A table of key-value pairs containing arguments passed to scripts, additional to the args defined in the global field. |
 | `source`                        | Defines which source to use, required when multiple sources are defined.             |
 | `external_test_files`           | A list of external test files that are needed for executing the test script for this target, additional to the files specified in the global field. These files are automatically downloaded. |
diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 12cae157..61d65386 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -243,14 +243,11 @@ impl<'a> Installer<'a> {
             println!("{notice}");
         }
 
-        // Get the target information from the package version info
-        let target = target_meta;
-
         self.determine_active(install_meta, &package_id, target)?;
 
         // Only run the test if the skip test option is false
         if !self.options.skip_test {
-            self.execute_test(&package_id, install_meta, &install_directory, &script_args, target)?;
+            self.execute_test(&package_id, install_meta, &install_directory, &script_args, target_meta)?;
         }
 
         Ok(())

From 81013beb118722e188f5bb78197cbe288b955d93 Mon Sep 17 00:00:00 2001
From: "Mr.panda" <dylanmartijn@gmail.com>
Date: Sun, 6 Sep 2026 22:05:50 +0200
Subject: [PATCH 4/8] Update docs/metadata.md

Co-authored-by: Frank <46161394+BraveChicken1@users.noreply.github.com>
---
 docs/metadata.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/metadata.md b/docs/metadata.md
index e944e030..8f68acbc 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -52,8 +52,8 @@ See the tables below for all different fields, look at [Target fields](#target-f
 | `use_<script>`                  | Needs to be set to true when the script should be used. (Only for `preinstall`, `postinstall` and `uninstall`) |
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. |
 | `revisions`                     | A list of strings containing a description of what changed in each metadata or script revision. |
-| `preinstall_notice`             | A message shown immediately before the preinstall step. A target-specific notice overrides this value. |
-| `postinstall_notice`            | A message shown immediately after the postinstall step. A target-specific notice overrides this value. |
+| `preinstall_notice`             | A message shown immediately before the preinstall step.                                         |
+| `postinstall_notice`            | A message shown immediately after the postinstall step.                                         |
 | `deprecation`                   | Defines when the version deprecates, disables and the reason.                  |
 | `script_args`                   | A table of key-value pairs containing arguments passed to scripts.             |
 | `external_test_files`           | A list of external test files that are needed for executing the test script. These files are automatically downloaded. |

From 8e6a50b0cdbe1620bd79e233b3ec1073da992c7e Mon Sep 17 00:00:00 2001
From: "Mr.panda" <dylanmartijn@gmail.com>
Date: Sun, 6 Sep 2026 22:05:57 +0200
Subject: [PATCH 5/8] Update src/installer/installer.rs

Co-authored-by: Frank <46161394+BraveChicken1@users.noreply.github.com>
---
 src/installer/installer.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 61d65386..7484d037 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -193,7 +193,10 @@ impl<'a> Installer<'a> {
         let script_args = version_meta.get_script_args(&install_meta.target_bounds)?;
         let target_meta = version_meta.get_target(&install_meta.target_bounds)?;
 
-        if let Some(notice) = target_meta.preinstall_notice.as_ref().or(version_meta.preinstall_notice.as_ref()) {
+        if let Some(notice) = &version_meta.preinstall_notice {
+            println!("{notice}");
+        }
+        if let Some(notice) = &target_meta.preinstall_notice {
             println!("{notice}");
         }
 

From 9a9ff140b8cf7a122ae4d4fd5ecbc6dea8c14cd0 Mon Sep 17 00:00:00 2001
From: "Mr.panda" <dylanmartijn@gmail.com>
Date: Sun, 6 Sep 2026 22:06:04 +0200
Subject: [PATCH 6/8] Update src/installer/installer.rs

Co-authored-by: Frank <46161394+BraveChicken1@users.noreply.github.com>
---
 src/installer/installer.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 7484d037..b7d9eb59 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -242,7 +242,10 @@ impl<'a> Installer<'a> {
 
         self.execute_postinstall(&package_id, install_meta, &install_directory, &script_args)?;
 
-        if let Some(notice) = target_meta.postinstall_notice.as_ref().or(version_meta.postinstall_notice.as_ref()) {
+        if let Some(notice) = &version_meta.postinstall_notice {
+            println!("{notice}");
+        }
+        if let Some(notice) = &target_meta.postinstall_notice {
             println!("{notice}");
         }
 

From 991c2c0a78950110b26031ca75cddd35649b269a Mon Sep 17 00:00:00 2001
From: "Mr.panda" <dylanmartijn@gmail.com>
Date: Sun, 6 Sep 2026 22:06:14 +0200
Subject: [PATCH 7/8] Update src/installer/installer.rs

Co-authored-by: Frank <46161394+BraveChicken1@users.noreply.github.com>
---
 src/installer/installer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index b7d9eb59..1e419521 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -249,7 +249,7 @@ impl<'a> Installer<'a> {
             println!("{notice}");
         }
 
-        self.determine_active(install_meta, &package_id, target)?;
+        self.determine_active(install_meta, &package_id, target_meta)?;
 
         // Only run the test if the skip test option is false
         if !self.options.skip_test {

From 73f138cd31693c587036d383460b96ed94591bcf Mon Sep 17 00:00:00 2001
From: Max Rijkers <max_rijkers1@icloud.com>
Date: Mon, 7 Sep 2026 21:37:40 +0200
Subject: [PATCH 8/8] Small review changes

---
 CHANGELOG.md                      |  1 +
 docs/metadata.md                  |  6 +++---
 src/installer/installer.rs        | 14 +++++++-------
 src/repositories/types/package.rs |  1 -
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b59420f5..a796ecaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - The uninstall now uninstalls packages in the correct order (so dependents before dependencies).
 - The `--exclude` flag for the `pit util package` command, to exclude certain packages when using the `--all` flag.
 - New and improved documentation.
+- The notice fields in the metadata to show a message before or after an installation.
 
 ### Changes
 - The build tests are now turned off by default and can be turned on with `--execute-build-test` (`--skip-build-test` is removed).
diff --git a/docs/metadata.md b/docs/metadata.md
index 8f68acbc..0d5c1eb2 100644
--- a/docs/metadata.md
+++ b/docs/metadata.md
@@ -53,9 +53,9 @@ See the tables below for all different fields, look at [Target fields](#target-f
 | `skip_symlinking`               | When set to true, the package is not symlinked after installation, preventing the package to be detectable through the PATH. |
 | `revisions`                     | A list of strings containing a description of what changed in each metadata or script revision. |
 | `preinstall_notice`             | A message shown immediately before the preinstall step.                                         |
-| `postinstall_notice`            | A message shown immediately after the postinstall step.                                         |
-| `deprecation`                   | Defines when the version deprecates, disables and the reason.                  |
-| `script_args`                   | A table of key-value pairs containing arguments passed to scripts.             |
+| `postinstall_notice`            | A message shown immediately after successfully completing the installation.                     |
+| `deprecation`                   | Defines when the version deprecates, disables and the reason.                                   |
+| `script_args`                   | A table of key-value pairs containing arguments passed to scripts.                              |
 | `external_test_files`           | A list of external test files that are needed for executing the test script. These files are automatically downloaded. |
 
 > Note that for the `license` field we try to be as accurate as possible. However sometimes the specific version of a license can be difficult to find, so it could be wrong. In such a case please create an issue on Packit.
diff --git a/src/installer/installer.rs b/src/installer/installer.rs
index 1e419521..751b9502 100644
--- a/src/installer/installer.rs
+++ b/src/installer/installer.rs
@@ -242,13 +242,6 @@ impl<'a> Installer<'a> {
 
         self.execute_postinstall(&package_id, install_meta, &install_directory, &script_args)?;
 
-        if let Some(notice) = &version_meta.postinstall_notice {
-            println!("{notice}");
-        }
-        if let Some(notice) = &target_meta.postinstall_notice {
-            println!("{notice}");
-        }
-
         self.determine_active(install_meta, &package_id, target_meta)?;
 
         // Only run the test if the skip test option is false
@@ -256,6 +249,13 @@ impl<'a> Installer<'a> {
             self.execute_test(&package_id, install_meta, &install_directory, &script_args, target_meta)?;
         }
 
+        if let Some(notice) = &version_meta.postinstall_notice {
+            println!("{notice}");
+        }
+        if let Some(notice) = &target_meta.postinstall_notice {
+            println!("{notice}");
+        }
+
         Ok(())
     }
 
diff --git a/src/repositories/types/package.rs b/src/repositories/types/package.rs
index 2e6d016f..bb6670e1 100644
--- a/src/repositories/types/package.rs
+++ b/src/repositories/types/package.rs
@@ -17,7 +17,6 @@ use crate::{
 pub struct PackageMeta {
     pub name: PackageName,
     pub description: String,
-
     pub homepage: Option<String>,
     pub versions: Vec<Version>,
     pub required_packit_version: Option<Version>,