From bbff4a953ad32c3021de3dba25e28372cb9b359d Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 12 Apr 2012 23:42:34 -0600 Subject: [PATCH] fix for VTAPE access issue --- debian/changelog | 2 ++ debian/patches/VTAPES-access.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + perl/Amanda/Header.pm | 7 ++++++- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/VTAPES-access.diff diff --git a/debian/changelog b/debian/changelog index 3c58fb6..dac5602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ amanda (1:3.3.1-3) unstable; urgency=low * patch from Robert Milan to fix kfreebsd FTBFS, closes: #667836 + * patch from amanda-users mailing list via Jose Manuel dos Santos Calhariz + that fixes amrecover issue with VTAPE access, closes: #666088 -- Bdale Garbee Thu, 12 Apr 2012 23:29:14 -0600 diff --git a/debian/patches/VTAPES-access.diff b/debian/patches/VTAPES-access.diff new file mode 100644 index 0000000..dc45f32 --- /dev/null +++ b/debian/patches/VTAPES-access.diff @@ -0,0 +1,18 @@ +diff --git a/perl/Amanda/Header.pm b/perl/Amanda/Header.pm +index d8cc692..4c85841 100644 +--- a/perl/Amanda/Header.pm ++++ b/perl/Amanda/Header.pm +@@ -482,7 +482,12 @@ sub from_string { + sub get_dle { + my $self = shift; + +- return Amanda::Header::HeaderXML->new($self->{'dle_str'}); ++# Patch taken from mailing list amanda-users on 2012/03/08 ++ if ($self->{'dle_str'}) { ++ return Amanda::Header::HeaderXML->new($self->{'dle_str'}); ++ } else { ++ return undef; ++ } + } + + package Amanda::Header::Header; diff --git a/debian/patches/series b/debian/patches/series index de4e07d..9394693 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ dumpdates-path glib-2.32.patch kfreebsd-ftbfs.diff +VTAPES-access.diff diff --git a/perl/Amanda/Header.pm b/perl/Amanda/Header.pm index d8cc692..4c85841 100644 --- a/perl/Amanda/Header.pm +++ b/perl/Amanda/Header.pm @@ -482,7 +482,12 @@ sub from_string { sub get_dle { my $self = shift; - return Amanda::Header::HeaderXML->new($self->{'dle_str'}); +# Patch taken from mailing list amanda-users on 2012/03/08 + if ($self->{'dle_str'}) { + return Amanda::Header::HeaderXML->new($self->{'dle_str'}); + } else { + return undef; + } } package Amanda::Header::Header; -- 2.30.2