git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.5.12.
[libguestfs.git]
/
tools
/
virt-tar
diff --git
a/tools/virt-tar
b/tools/virt-tar
index
612b500
..
3e6e20b
100755
(executable)
--- a/
tools/virt-tar
+++ b/
tools/virt-tar
@@
-25,7
+25,6
@@
use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
inspect_operating_systems mount_operating_system);
use Pod::Usage;
use Getopt::Long;
inspect_operating_systems mount_operating_system);
use Pod::Usage;
use Getopt::Long;
-use File::Temp qw/tempfile/;
use Locale::TextDomain 'libguestfs';
=encoding utf8
use Locale::TextDomain 'libguestfs';
=encoding utf8
@@
-202,9
+201,11
@@
if ($mode eq "x") {
} else { # $mode eq "u"
$directory = pop @ARGV;
$tarball = pop @ARGV;
} else { # $mode eq "u"
$directory = pop @ARGV;
$tarball = pop @ARGV;
- die __"virt-tar: $tarball: file not found\n" unless -f $tarball;
+ die __x("virt-tar: {tarball}: file not found\n",
+ tarball => $tarball) unless -f $tarball;
}
}
-die __"virt-tar: $directory: directory name must start with '/' character\n"
+die __x("virt-tar: {dir}: directory name must start with '/' character\n",
+ dir => $directory)
unless substr ($directory, 0, 1) eq "/";
my @args = (\@ARGV);
unless substr ($directory, 0, 1) eq "/";
my @args = (\@ARGV);
@@
-225,7
+226,6
@@
my %fses =
my $oses = inspect_operating_systems ($g, \%fses);
my @roots = keys %$oses;
my $oses = inspect_operating_systems ($g, \%fses);
my @roots = keys %$oses;
-die __"no root device found in this operating system image\n" if @roots == 0;
die __"multiboot operating systems are not supported by virt-tar\n" if @roots > 1;
my $root_dev = $roots[0];
die __"multiboot operating systems are not supported by virt-tar\n" if @roots > 1;
my $root_dev = $roots[0];