[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1035335: marked as done (unblock: solarpowerlog/0.25-1)



Your message dated Mon, 01 May 2023 09:09:07 +0000
with message-id <E1ptPWt-002H2T-Lo@respighi.debian.org>
and subject line unblock solarpowerlog
has caused the Debian Bug report #1035335,
regarding unblock: solarpowerlog/0.25-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1035335: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1035335
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: solarpowerlog@packages.debian.org
Control: affects -1 + src:solarpowerlog

Please unblock package solarpowerlog

[ Reason ]

A problem has been reported to me, that the a valid HTML
writer configuration are rejected by solarpowerlog. This is
a regression in 0.25.

A similar problem exists with the DBWriter, the example
configurations are using a differnt field for the password,
so configurations using a password will be rejected too.


[ Impact ]
Parts of solarpowerlog are not usable.

[ Tests ]
Manual tests.

[ Risks ]
Package is a leaf package, code change is small

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock solarpowerlog/0.25-1
diff -Nru solarpowerlog-0.25/debian/changelog solarpowerlog-0.25/debian/changelog
--- solarpowerlog-0.25/debian/changelog	2022-01-07 14:20:10.000000000 +0100
+++ solarpowerlog-0.25/debian/changelog	2023-05-01 10:00:20.000000000 +0200
@@ -1,3 +1,9 @@
+solarpowerlog (0.25-2) unstable; urgency=medium
+
+  * Cherry-pick fixes for broken htmlwriter and dbfilter. (Closes: #1035333)
+
+ -- Tobias Frost <tobi@debian.org>  Mon, 01 May 2023 10:00:20 +0200
+
 solarpowerlog (0.25-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru solarpowerlog-0.25/debian/patches/fix_dbwriter.patch solarpowerlog-0.25/debian/patches/fix_dbwriter.patch
--- solarpowerlog-0.25/debian/patches/fix_dbwriter.patch	1970-01-01 01:00:00.000000000 +0100
+++ solarpowerlog-0.25/debian/patches/fix_dbwriter.patch	2023-05-01 09:41:37.000000000 +0200
@@ -0,0 +1,48 @@
+commit e77389f3b88794b2ba57624052195e3b399cc1a2
+Author: Tobias Frost <tobi@debian.org>
+Date:   Mon May 1 09:31:47 2023 +0200
+
+    [DBWriter] Bugfix: Use db_password (instead db_passwd) for password configuration
+    
+    (to be aligned with the examples)
+
+diff --git a/src/DataFilters/DBWriter/CDBWriterFilter.cpp b/src/DataFilters/DBWriter/CDBWriterFilter.cpp
+index 6e3e141..4242a6b 100644
+--- a/src/DataFilters/DBWriter/CDBWriterFilter.cpp
++++ b/src/DataFilters/DBWriter/CDBWriterFilter.cpp
+@@ -193,7 +193,7 @@ bool CDBWriterFilter::CheckConfig()
+             fail = true;
+         }
+         if (_cfg_cache_db_passwd.empty()) {
+-            _missing_req_parameter(logger, _cfg_cache_db_type, "db_passwd");
++            _missing_req_parameter(logger, _cfg_cache_db_type, "db_password");
+             fail = true;
+         }
+         if (_cfg_cache_db_database.empty()) {
+@@ -231,7 +231,7 @@ bool CDBWriterFilter::CheckConfig()
+         }
+ 
+         if (_cfg_cache_db_passwd.empty()) {
+-            _missing_req_parameter(logger, _cfg_cache_db_type, "db_passwd");
++            _missing_req_parameter(logger, _cfg_cache_db_type, "db_password");
+             fail = true;
+         }
+         if (_cfg_cache_db_database.empty()) {
+@@ -270,7 +270,7 @@ bool CDBWriterFilter::CheckConfig()
+         }
+ 
+         if (!_cfg_cache_db_passwd.empty()) {
+-            _wrong_parameter(logger, _cfg_cache_db_type, "db_passwd");
++            _wrong_parameter(logger, _cfg_cache_db_type, "db_password");
+             fail = true;
+         }
+ 
+@@ -701,7 +701,7 @@ CConfigCentral* CDBWriterFilter::getConfigCentralObject(CConfigCentral* parent)
+              _cfg_cache_db_mode, std::string(""))
+         ("db_user", Description_DBWriter_db_user,
+             _cfg_cache_db_user, std::string(""))
+-        ("db_passwd", Description_DBWriter_db_passwd,
++        ("db_password", Description_DBWriter_db_passwd,
+             _cfg_cache_db_passwd, std::string(""))
+         ("db_database", Description_DBWriter_db_database,
+             _cfg_cache_db_database, std::string(""))
diff -Nru solarpowerlog-0.25/debian/patches/fix_htmlwriter.patch solarpowerlog-0.25/debian/patches/fix_htmlwriter.patch
--- solarpowerlog-0.25/debian/patches/fix_htmlwriter.patch	1970-01-01 01:00:00.000000000 +0100
+++ solarpowerlog-0.25/debian/patches/fix_htmlwriter.patch	2023-05-01 09:41:37.000000000 +0200
@@ -0,0 +1,19 @@
+commit e4bd00f13656ff8815e52f23a59daff46271d646
+Author: Tobias Frost <tobi@debian.org>
+Date:   Mon May 1 09:26:31 2023 +0200
+
+    [HTMLWriter] Bugfix: Logic error in rejected valid configuration.
+
+diff --git a/src/DataFilters/HTMLWriter/CHTMLWriter.cpp b/src/DataFilters/HTMLWriter/CHTMLWriter.cpp
+index 192fe05..2c7ab54 100644
+--- a/src/DataFilters/HTMLWriter/CHTMLWriter.cpp
++++ b/src/DataFilters/HTMLWriter/CHTMLWriter.cpp
+@@ -219,7 +219,7 @@ bool CHTMLWriter::CheckConfig()
+ 
+ 	std::auto_ptr<CConfigCentral> cc(getConfigCentralObject(NULL));
+ 
+-	bool fail = cc->CheckConfig(logger, configurationpath);
++	bool fail = !cc->CheckConfig(logger, configurationpath);(cc->CheckConfig(logger, configurationpath));
+ 
+     if (!fail && !base) {
+         LOGERROR(logger, "Cannot find datassource with the name "
diff -Nru solarpowerlog-0.25/debian/patches/series solarpowerlog-0.25/debian/patches/series
--- solarpowerlog-0.25/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ solarpowerlog-0.25/debian/patches/series	2023-05-01 09:41:37.000000000 +0200
@@ -0,0 +1,2 @@
+fix_htmlwriter.patch
+fix_dbwriter.patch

--- End Message ---
--- Begin Message ---
Unblocked.

--- End Message ---

Reply to: