[pbs-devel] [PATCH v2 backup stable-2 0/3] followup fixes for pbs2to3

[pbs-devel] [PATCH v2 backup stable-2 0/3] followup fixes for pbs2to3

[Christian Ebner]

Sets failure messages to be bold and fixes whitespace issues and typos

Christian Ebner (3):
  pbs2to3: fix typo s/neighter/neither/
  pbs2to3: fix whitespaces
  pbs2to3: set failure messages to bold

 src/bin/pbs2to3.rs | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

-- 
2.30.2

[pbs-devel] [PATCH v2 backup stable-2 1/3] pbs2to3: fix typo s/neighter/neither/

[Christian Ebner]

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/bin/pbs2to3.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
index a3aa2816..168c9f00 100644
--- a/src/bin/pbs2to3.rs
+++ b/src/bin/pbs2to3.rs
@@ -296,7 +296,7 @@ impl Checker {
                 if suite != OLD_SUITE && suite != NEW_SUITE {
                     let location = repo_file.path.clone().unwrap_or_default();
                     self.output.log_notice(format!(
-                        "found unusual suite '{suite}', neighter old '{OLD_SUITE}' nor new \
+                        "found unusual suite '{suite}', neihter old '{OLD_SUITE}' nor new \
                             '{NEW_SUITE}'..\n        Affected file {location}\n        Please \
                             assure this is shipping compatible packages for the upgrade!"
                     ))?;
-- 
2.30.2

[pbs-devel] [PATCH v2 backup stable-2 2/3] pbs2to3: fix whitespaces

[Christian Ebner]

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/bin/pbs2to3.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
index 168c9f00..d85551ec 100644
--- a/src/bin/pbs2to3.rs
+++ b/src/bin/pbs2to3.rs
@@ -401,7 +401,7 @@ impl Checker {
         } else if self.get_systemd_unit_state("ntp.service")?.1 == SystemdUnitState::Active {
             self.output.log_info(
                 "Debian deprecated and removed the ntp package for Bookworm, but the system \
-	            will automatically migrate to the 'ntpsec' replacement package on upgrade.",
+                    will automatically migrate to the 'ntpsec' replacement package on upgrade.",
             )?;
         } else if self.get_systemd_unit_state("chrony.service")?.1 == SystemdUnitState::Active
             || self.get_systemd_unit_state("openntpd.service")?.1 == SystemdUnitState::Active
-- 
2.30.2

[pbs-devel] [PATCH v2 backup stable-2 3/3] pbs2to3: set failure messages to bold

[Christian Ebner]

... and reset instead of setting color to clear settings

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 src/bin/pbs2to3.rs | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
index d85551ec..8ff13b47 100644
--- a/src/bin/pbs2to3.rs
+++ b/src/bin/pbs2to3.rs
@@ -485,19 +485,22 @@ impl ConsoleOutput {
         Ok(())
     }
 
-    pub fn set_color(&mut self, color: Color) -> Result<(), Error> {
+    pub fn set_color(&mut self, color: Color, bold: bool) -> Result<(), Error> {
         self.stream
-            .set_color(ColorSpec::new().set_fg(Some(color)))?;
+            .set_color(ColorSpec::new().set_fg(Some(color)).set_bold(bold))?;
         Ok(())
     }
 
+    pub fn reset(&mut self) -> Result<(), std::io::Error> {
+        self.stream.reset()
+    }
+
     pub fn log_line(&mut self, level: LogLevel, message: &str) -> Result<(), Error> {
         match level {
             LogLevel::Pass => {
                 self.counters.pass += 1;
-                self.set_color(Color::Green)?;
+                self.set_color(Color::Green, false)?;
                 writeln!(&mut self.stream, "PASS: {}", message)?;
-                self.set_color(Color::White)?;
             }
             LogLevel::Info => {
                 writeln!(&mut self.stream, "INFO: {}", message)?;
@@ -508,21 +511,21 @@ impl ConsoleOutput {
             }
             LogLevel::Notice => {
                 self.counters.notice += 1;
+                self.set_color(Color::White, true)?;
                 writeln!(&mut self.stream, "NOTICE: {}", message)?;
             }
             LogLevel::Warn => {
                 self.counters.warn += 1;
-                self.set_color(Color::Yellow)?;
+                self.set_color(Color::Yellow, true)?;
                 writeln!(&mut self.stream, "WARN: {}", message)?;
-                self.set_color(Color::White)?;
             }
             LogLevel::Fail => {
                 self.counters.fail += 1;
-                self.set_color(Color::Red)?;
+                self.set_color(Color::Red, true)?;
                 writeln!(&mut self.stream, "FAIL: {}", message)?;
-                self.set_color(Color::White)?;
             }
         }
+        self.reset()?;
         Ok(())
     }
 
@@ -559,28 +562,28 @@ impl ConsoleOutput {
             + self.counters.skip
             + self.counters.warn;
 
-        self.set_color(Color::White)?;
         writeln!(&mut self.stream, "TOTAL:     {total}")?;
-        self.set_color(Color::Green)?;
+        self.set_color(Color::Green, false)?;
         writeln!(&mut self.stream, "PASSED:    {}", self.counters.pass)?;
-        self.set_color(Color::White)?;
+        self.reset()?;
         writeln!(&mut self.stream, "SKIPPED:   {}", self.counters.skip)?;
         writeln!(&mut self.stream, "NOTICE:    {}", self.counters.notice)?;
         if self.counters.warn > 0 {
-            self.set_color(Color::Yellow)?;
+            self.set_color(Color::Yellow, false)?;
             writeln!(&mut self.stream, "WARNINGS:  {}", self.counters.warn)?;
         }
         if self.counters.fail > 0 {
-            self.set_color(Color::Red)?;
+            self.set_color(Color::Red, true)?;
             writeln!(&mut self.stream, "FAILURES:  {}", self.counters.fail)?;
         }
         if self.counters.warn > 0 || self.counters.fail > 0 {
-            let mut color = Color::Yellow;
-            if self.counters.fail > 0 {
-                color = Color::Red;
-            }
+            let (color, bold) = if self.counters.fail > 0 {
+                (Color::Red, true)
+            } else {
+                (Color::Yellow, false)
+            };
 
-            self.set_color(color)?;
+            self.set_color(color, bold)?;
             writeln!(
                 &mut self.stream,
                 "\nATTENTION: Please check the output for detailed information!",
@@ -592,7 +595,7 @@ impl ConsoleOutput {
                 )?;
             }
         }
-        self.set_color(Color::White)?;
+        self.reset()?;
         Ok(())
     }
 }
-- 
2.30.2