← Back to branch summary

~ubuntu-branches/debian/sid/abi-compliance-checker/sid

« back to all changes in this revision

Viewing changes to debian/patches/allow-suffix-on-dumps.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Malaterre
  • Date: 2013-07-29 21:56:09 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20130729215609-7wv3mjhn5mn6yceb
Tags: 1.99.7-1
* New upstream
  - Fixed default arguments of methods (broken in 1.99.1)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/allow-suffix-on-dumps.patch
 
1
Description: allow suffix on dumps
 
2
 Since ABI/API dumps can be arch specific, we need to be able to store
 
3
 a dump per arch for comparison using dh_acc. Debhelper already
 
4
 supports .ARCH and .OS suffixes, hence allow suffixes on the dump in
 
5
 abi-compliance-checker. Other ways to solve this are welcome.
 
6
Author: Dmitrijs Ledkovs <xnox@debian.org>
 
7
 
 
8
--- abi-compliance-checker-1.98.8.orig/abi-compliance-checker.pl
 
9
+++ abi-compliance-checker-1.98.8/abi-compliance-checker.pl
 
10
@@ -8362,7 +8362,7 @@ sub unpackDump($)
 
11
         }
 
12
         return $Contents[0];
 
13
     }
 
14
-    elsif($FileName=~s/\Q.tar.gz\E\Z//g)
 
15
+    elsif($FileName=~s/\Q.tar.gz\E.*\Z//g)
 
16
     { # *.tar.gz
 
17
         if($OSgroup eq "windows")
 
18
         { # -xvzf option is not implemented in tar.exe (2003)
 
19
@@ -20326,7 +20326,7 @@ sub printErrorLog($)
 
20
 
 
21
 sub isDump($)
 
22
 {
 
23
-    if(get_filename($_[0])=~/\A(.+)\.(abi|abidump|dump)(\.tar\.gz|\.zip|\.xml|)\Z/) {
 
24
+    if(get_filename($_[0])=~/\A(.+)\.(abi|abidump|dump)(\.tar\.gz|\.zip|\.xml|)(.+)\Z/) {
 
25
         return $1;
 
26
     }
 
27
     return 0;