search for: remove_appl

...GuestOS/RedHat.pm | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index cd2f8e6..380dacb 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -862,6 +862,9 @@ sub remove_application $g->command(['rpm', '-e', $name]); }; die($@) if($@); + + # Make augeas reload in case the removal changed anything + $g->aug_load(); } =item get_application_owner(file) @@ -902,6 +905,9 @@ sub _install_rpms # Propagate command failur...

...$g->command(['rpm', '-e', $output[0]]); # Make augeas reload so it knows the kernel's gone - $g->aug_load(); + eval { + $g->aug_load(); + }; + $self->_augeas_error($@) if ($@); } =item add_application(label) @@ -928,13 +992,14 @@ sub remove_application my $name = shift; my $g = $self->{g}; + $g->command(['rpm', '-e', $name]); + + # Make augeas reload in case the removal changed anything eval { - $g->command(['rpm', '-e', $name]); + $g->aug_load(); }; -...

This patch series includes a repost of Milan's unmodified RHN support patch because I haven't pushed it yet. On top of that patch, it includes the capabilities patch in as many bits as I could make it into. The big one is 7/8. I've tested all of the following guests both with and without RHN registration: Xen RHEL 54 PV Xen RHEL 51 PV Xen RHEL 48 PV ESX RHEL 54 FV

...+ }; + + die($@) if($@); +} + +sub add_application +{ + my $self = shift; + my $label = shift; + my $user_arch = "i386"; # XXX: Need to get this from inspection! + + my $filename = $self->match_file($label, $user_arch); + $self->install_rpm($filename); +} + +sub remove_application +{ + my $self = shift; + my $name = shift; + + my $g = $self->{g}; + eval { + $g->command(["rpm", "-e", $name]); + }; + die($@) if($@); +} + +sub match_file +{ + my $self = shift; + my ($label, $arch) = @_; + + my $desc = $self->...

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

These patches combine HVSource and HVTarget into a single Converter. This should make it more obvious where to hack without losing any practical flexibility. GuestOS remains separate. GuestOS is now a misnomer, because it's really only a Linux distro abstraction. It will be useless for Windows, for example. Functions which you'd expect to be different on a non-RH distro should live in

With this patchset I have successfully[1] imported a RHEL 5 guest directly from ESX with the following command line: virt-v2v -ic 'esx://yellow.marston/?no_verify=1' -op transfer RHEL5-64 Login details are stored in ~/.netrc Note that this is the only guest I've tested against. I haven't for example, checked that I haven't broken Xen imports. Matt [1] With the exception of