From 150812c15c6aac49cd695d47837848174a42928f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 15 Aug 2019 19:05:59 -0700
Subject: [PATCH] short-circuit copy_devcdrom_as_isofile if no ISO_URL

There are some situations in which ISO_URL is not set (e.g. a
manual POST to re-run tests after download has been done). If
there is no ISO_URL just skip the checksum check here.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 lib/utils.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/utils.pm b/lib/utils.pm
index 81282f4e..d82e30f3 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -887,6 +887,9 @@ sub copy_devcdrom_as_isofile {
     assert_script_run "dd if=/dev/cdrom of=$isoname", 360;
     # verify iso checksum
     my $cdurl = get_var('ISO_URL');
+    # ISO_URL may not be set if we POSTed manually or something; just assume
+    # we're OK in that case
+    return unless $cdurl;
     my $cmd = <<EOF;
 urld="$cdurl"; urld=\${urld%/*}; chkf=\$(curl -fs \$urld/ |grep CHECKSUM | sed -E 's/.*href=.//; s/\".*//') && curl -f \$urld/\$chkf -o /tmp/x
 chkref=\$(grep -E 'SHA256.*dvd' /tmp/x | sed -e 's/.*= //') && echo "\$chkref $isoname" >/tmp/x