OS (Linux): don't change prettyName on Ubuntu development branch

CarterLi · CarterLi · commit 4d831c8c73a2 · 2025-09-30T15:24:52.000+08:00
Ref: #1483
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
@@ -371,7 +371,10 @@ void ffDetectOSImpl(FFOSResult* os)
     if(ffStrbufEqualS(&os->id, "ubuntu"))
     {
         if (!getUbuntuFlavour(os))
-            ffStrbufSetF(&os->prettyName, "%s %s", os->name.chars, os->version.chars); // os->version contains code name
+        {
+            if (!ffStrbufEndsWithS(&os->prettyName, " (development branch)"))
+                ffStrbufSetF(&os->prettyName, "%s %s", os->name.chars, os->version.chars); // os->version contains code name
+        }
     }
     else if(ffStrbufEqualS(&os->id, "debian"))
     {

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,10 @@ void ffDetectOSImpl(FFOSResult* os)`
`371`	`371`	`if(ffStrbufEqualS(&os->id, "ubuntu"))`
`372`	`372`	`{`
`373`	`373`	`if (!getUbuntuFlavour(os))`
`374`		`- ffStrbufSetF(&os->prettyName, "%s %s", os->name.chars, os->version.chars); // os->version contains code name`
	`374`	`+ {`
	`375`	`+ if (!ffStrbufEndsWithS(&os->prettyName, " (development branch)"))`
	`376`	`+ ffStrbufSetF(&os->prettyName, "%s %s", os->name.chars, os->version.chars); // os->version contains code name`
	`377`	`+ }`
`375`	`378`	`}`
`376`	`379`	`else if(ffStrbufEqualS(&os->id, "debian"))`
`377`	`380`	`{`