From f6c72b8ac8013909f475769a1c70b67fc72fd424 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Wed, 21 Jun 2023 15:34:39 +0200
Subject: [PATCH] Fix duplicate build link on CG taskinfo page

Related: https://pagure.io/koji/issue/3856
---
 www/kojiweb/index.py       | 9 ++++++---
 www/kojiweb/taskinfo.chtml | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index 731fe878..ffdc4899 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -683,7 +683,6 @@ def taskinfo(environ, taskID):
         taskBuild = builds[0]
     else:
         taskBuild = None
-    values['taskBuild'] = taskBuild
 
     values['estCompletion'] = None
     if taskBuild and taskBuild['state'] == koji.BUILD_STATES['BUILDING']:
@@ -746,7 +745,7 @@ def taskinfo(environ, taskID):
     if 'buildrootID' in params:
         params['buildroot'] = server.getBuildroot(params.pop('buildrootID'))
 
-    values['taskBuilds'] = []
+    taskBuilds = []
     if task['state'] in (koji.TASK_STATES['CLOSED'], koji.TASK_STATES['FAILED']):
         try:
             result = server.getTaskResult(task['id'])
@@ -758,12 +757,16 @@ def taskinfo(environ, taskID):
             values['result'] = result
             values['excClass'] = None
             if task['method'] == 'buildContainer' and 'koji_builds' in result:
-                values['taskBuilds'] = [
+                taskBuilds = [
                     server.getBuild(int(buildID)) for buildID in result['koji_builds']]
     else:
         values['result'] = None
         values['excClass'] = None
 
+    if taskBuild and taskBuild['build_id'] not in [x['build_id'] for x in taskBuilds]:
+        taskBuilds.append(taskBuild)
+    values['taskBuilds'] = taskBuilds
+
     full_result_text, abbr_result_text = kojiweb.util.task_result_to_html(
         values['result'], values['excClass'], abbr_postscript='...')
     values['full_result_text'] = full_result_text
diff --git a/www/kojiweb/taskinfo.chtml b/www/kojiweb/taskinfo.chtml
index 3cac18c1..cc04330c 100644
--- a/www/kojiweb/taskinfo.chtml
+++ b/www/kojiweb/taskinfo.chtml
@@ -127,11 +127,6 @@ $value
       #end if
       </td>
     </tr>
-    #if $taskBuild
-    <tr>
-      <th>Build</th><td><a href="buildinfo?buildID=$taskBuild.build_id">$util.escapeHTML($koji.buildLabel($taskBuild))</a></td>
-    </tr>
-    #end if
     #if $taskBuilds
     #for $build in $taskBuilds
     <tr>