TestSupport: Break out target_extract_distpart

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index cebeb0d10e012cc54fd771ce98fd909af9ef76c3..6de566ce427018a88b1ab0e61b459cc2a0d4af9b 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -70,7 +70,8 @@ BEGIN {
                       target_run_apt
                       target_install_packages target_install_packages_norec
                       target_jobdir target_extract_jobdistpath_subdir
-                      target_extract_jobdistpath target_tftp_prefix
+                      target_extract_jobdistpath target_extract_distpart
+                     target_tftp_prefix
                       lv_create lv_dev_mapper
 
                       poll_loop tcpconnect await_tcp
@@ -2343,6 +2344,13 @@ sub target_extract_jobdistpath ($$$$$) {
     target_cmd_root($ho, "cd / && tar -hzxf $distcopy", 300);
 }
 
+sub target_extract_distpart ($$;$) {
+    my ($ho, $part, $distpath_r) = @_;
+    target_extract_jobdistpath($ho, $part, "path_${part}dist",
+               $r{"$ho->{Ident}_${part}buildjob"} // $r{"${part}buildjob"},
+               $distpath_r);
+}
+
 sub target_tftp_prefix ($) {
     my ($ho) = @_;
 

diff --git a/ts-xen-install b/ts-xen-install
index fcbb6978842ca01b118e50352a03c6c0035bb078..17f76629bc7930ef72483b43dcbd04519ee606ef 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -81,9 +81,7 @@ sub extract () {
     push @parts, 'libvirt' if $r{toolstack} eq "libvirt";
 
     foreach my $part (@parts) {
-        target_extract_jobdistpath($ho, $part, "path_${part}dist",
-               $r{"$ho->{Ident}_${part}buildjob"} // $r{"${part}buildjob"},
-               \%distpath);
+       target_extract_distpart($ho, $part, \%distpath);
     }
     if (target_file_exists($ho, "/usr/lib64/efi/xen.efi")) {
        target_cmd_root($ho,<<END);