[packages/poldek] No ':' after line number.

arekm arekm at pld-linux.org
Tue Apr 14 17:08:53 CEST 2026


commit d1adbc7551110e290d82895d4a88bb8b93e975c0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Apr 14 17:08:36 2026 +0200

    No ':' after line number.

 poldek-dup-sources.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)
---
diff --git a/poldek-dup-sources.patch b/poldek-dup-sources.patch
index ffe54ba..f98da4a 100644
--- a/poldek-dup-sources.patch
+++ b/poldek-dup-sources.patch
@@ -1,4 +1,4 @@
-commit 5c69a75ec8cc64b888a03fefffca9fe9b15c5cc7
+commit bd97788fa990b4b2cd957c540399cec35afab526
 Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
 Date:   Tue Apr 14 16:26:11 2026 +0200
 
@@ -6,7 +6,72 @@ Date:   Tue Apr 14 16:26:11 2026 +0200
     
     Print which config file:line each duplicated source was defined at,
     making it easy to find and fix the duplication.
+    
+    Also fix conf.c filemark formatting: remove trailing colon from
+    stored __file__line value and format strings to avoid double-colon
+    artifacts in error messages.
 
+diff --git a/conf.c b/conf.c
+index 83e625f6..f9f775b0 100644
+--- a/conf.c
++++ b/conf.c
+@@ -505,7 +505,7 @@ static int verify_param_presence(tn_hash *ht_sect, const char *section,
+ 
+     if (overwrite || (tag->flags & CONF_TYPE_F_MULTI_EXCL)) {
+         if (!overwrite || poldek_VERBOSE > 1)
+-            logn(LOGWARN, _("%s %s::%s redefined"), filemark, section, name);
++            logn(LOGWARN, _("%s: %s::%s redefined"), filemark, section, name);
+         n_hash_remove(ht_sect, name);
+ 
+     } else if ((tag->flags & CONF_TYPE_F_MULTI) == 0) {
+@@ -541,9 +541,9 @@ static int add_param(tn_hash *ht_sect, const char *section,
+     validate = (flags & ADD_PARAM_VALIDATE);
+ 
+     if (path)
+-        n_snprintf(filemark, sizeof(filemark), "%s:%d:", path, nline);
++        n_snprintf(filemark, sizeof(filemark), "%s:%d", path, nline);
+     else
+-        n_snprintf(filemark, sizeof(filemark), "config:");
++        n_snprintf(filemark, sizeof(filemark), "config");
+ 
+     if ((tagindex = find_tag(section, name, &sect)) == -1) {
+         if (*name == '_')       /* internal or _macro */
+@@ -554,7 +554,7 @@ static int add_param(tn_hash *ht_sect, const char *section,
+             tag = &unknown_tag;
+ 
+         } else {
+-            logn(LOGWARN, _("%s unknown option '%s::%s'"), filemark,
++            logn(LOGWARN, _("%s: unknown option '%s::%s'"), filemark,
+                  section, name);
+             return 0;
+         }
+@@ -604,7 +604,7 @@ static int add_param(tn_hash *ht_sect, const char *section,
+         val = "";
+ 
+     if (val == NULL) {
+-        logn(LOGERR, _("%s invalid value of '%s::%s'"), filemark, section, name);
++        logn(LOGERR, _("%s: invalid value of '%s::%s'"), filemark, section, name);
+         return 0;
+     }
+ 
+@@ -618,7 +618,7 @@ static int add_param(tn_hash *ht_sect, const char *section,
+         }
+ 
+         if (!valid) {
+-            logn(LOGWARN, _("%s invalid value '%s' of '%s::%s'"), filemark,
++            logn(LOGWARN, _("%s: invalid value '%s' of '%s::%s'"), filemark,
+                  val, section, name);
+             return 0;
+         }
+@@ -826,7 +826,7 @@ static tn_hash *open_section_ht(tn_hash *htconf,
+         char filemark[PATH_MAX];
+         struct copt *opt;
+ 
+-        n_snprintf(filemark, sizeof(filemark), "%s:%d:", path, nline);
++        n_snprintf(filemark, sizeof(filemark), "%s:%d", path, nline);
+         opt = copt_new("__file__line");
+         opt->val = n_strdup(filemark);
+         n_hash_insert(ht_sect, opt->name, opt);
 diff --git a/pkgdir/source.c b/pkgdir/source.c
 index 28c0049f..8d23592d 100644
 --- a/pkgdir/source.c
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/d1adbc7551110e290d82895d4a88bb8b93e975c0



More information about the pld-cvs-commit mailing list