From: Sebastian Harl <sh@tokkee.org>
Date: Sun, 20 May 2007 00:45:14 +0000 (+0200)
Subject: Updated extractDS_path.dpatch to current version for migrate-3-4.px.
X-Git-Tag: collectd-4.0.2-1~32
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=95e874b47d160016cc39825b5baeb4083d38a389;p=pkg-collectd.git

Updated extractDS_path.dpatch to current version for migrate-3-4.px.
---

diff --git a/debian/patches/extractDS_path.dpatch b/debian/patches/extractDS_path.dpatch
index e8395c5..5c95cf1 100755
--- a/debian/patches/extractDS_path.dpatch
+++ b/debian/patches/extractDS_path.dpatch
@@ -8,7 +8,7 @@
 diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
 --- a/contrib/migrate-3-4.px
 +++ b/contrib/migrate-3-4.px
-@@ -166,7 +166,7 @@ for (@Files)
+@@ -165,7 +165,7 @@ for (@Files)
  			my $src_ds = $src_dses->[$i];
  			$dest->{'type_instance'} = $type_instances->[$i];
  			$dest_filename = get_filename ($dest);
@@ -17,3 +17,25 @@ diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
  		}
  	}
  	elsif (exists ($TypeRename{$orig->{'type'}}))
+@@ -360,17 +360,17 @@ sub special_disk
+ 		$OutDirs{$dest_directory} = 1;
+ 	}
+ 
+-	print "./extractDS.px -i '$InDir/$orig_filename' -s 'rmerged' -s 'wmerged' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
++	print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rmerged' -s 'wmerged' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
+ 
+ 	$dest->{'type'} = 'disk_octets';
+ 	$dest_filename = get_filename ($dest);
+-	print "./extractDS.px -i '$InDir/$orig_filename' -s 'rbytes' -s 'wbytes' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
++	print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rbytes' -s 'wbytes' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
+ 
+ 	$dest->{'type'} = 'disk_ops';
+ 	$dest_filename = get_filename ($dest);
+-	print "./extractDS.px -i '$InDir/$orig_filename' -s 'rcount' -s 'wcount' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
++	print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rcount' -s 'wcount' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
+ 
+ 	$dest->{'type'} = 'disk_time';
+ 	$dest_filename = get_filename ($dest);
+-	print "./extractDS.px -i '$InDir/$orig_filename' -s 'rtime' -s 'wtime' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
++	print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s 'rtime' -s 'wtime' -o '$OutDir/$dest_filename' -d 'read' -d 'write'\n";
+ }