fix for VTAPE access issue

diff --git a/debian/changelog b/debian/changelog
index 3c58fb652cab28408a9cc9f06fd6b80a53a3f80a..dac5602c474f0c808e78d858cfdf6cd316cb1ec5 100644 (file)
--- 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 <bdale@gag.com>  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 (file)
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 de4e07db022f340c8d55b7a7998a0ba178f61748..9394693638ce5fd0481649662c1f41cab13491e1 100644 (file)
--- 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 d8cc69275945307f770f3c848d360a8a3f6d6801..4c8584189ddb1ac4781bee200026a3e3c28e15c2 100644 (file)
--- 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;