github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-04-13 23:23:41 +00:00
Code Releases Activity

Use File::Which instead of findBinary or which

Browse Source
This commit is contained in:
Axel Beckert
2013-07-11 00:39:05 +02:00
parent b271bf6a63
commit 9c47e5da4f
5 changed files with 15 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/xen-create-image
View File

@@ -1151,7 +1151,7 @@ E_O_ERROR
foreach my $bin (@required)
{
if ( !defined( findBinary($bin) ) )
if ( !defined( which($bin) ) )
{
logprint( "The script '$bin' was not found.\nAborting\n\n" );
$CONFIG{'FAIL'} = 1;
@@ -2274,7 +2274,7 @@ sub checkBinariesPresent
foreach my $file (@required)
{
if ( !defined( findBinary($file) ) )
if ( !defined( which($file) ) )
{
logprint("The following binary is required to run this tool\n");
logprint("\t$file\n");
@@ -2290,7 +2290,7 @@ sub checkBinariesPresent
{
# loopback image
if ( !defined( findBinary("dd") ) )
if ( !defined( which("dd") ) )
{
logprint("The following binary is required to run this tool\n");
logprint("\tdd\n");
@@ -2311,7 +2311,7 @@ sub checkBinariesPresent
foreach my $file (@evms)
{
if ( !defined( findBinary($file) ) )
if ( !defined( which($file) ) )
{
logprint("The following binary is required to run this tool\n");
logprint("\t$file\n");
@@ -2331,7 +2331,7 @@ sub checkBinariesPresent
foreach my $file (@lvm)
{
if ( !defined( findBinary($file) ) )
if ( !defined( which($file) ) )
{
logprint("The following binary is required to run this tool\n");
logprint("\t$file\n");
@@ -3305,7 +3305,7 @@ sub createFilesystem
#
my ($binary, $args) = split(/ /, $command, 2);
if ( !defined( findBinary($binary) ) )
if ( !defined( which($binary) ) )
{
logprint(
"The binary '$binary' required to create the filesystem $fs is missing\n"

7
bin/xt-guess-suite-and-mirror
View File

@@ -69,6 +69,7 @@ my @sources_list_files = ( '/etc/apt/sources.list',
use File::Slurp;
use Getopt::Long;
use Pod::Usage;
use File::Which;
use strict;
@@ -148,10 +149,8 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n ".
join("\n ", @sources_list_files)."\n" unless $found;
my $lsb_release = `which lsb_release`;
chomp($lsb_release);
if (!$found and $lsb_release and -x $lsb_release) {
my $lsb_release = which('lsb_release');
if (!$found and defined($lsb_release) and -x $lsb_release) {
my $vendor = `$lsb_release -s -i`;
if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {