[SCM] Debian package checker branch, master, updated. 2.2.9-49-gd848434
The following commit has been merged in the master branch:
commit 4ccf40da392b31058e9b4a0d733a79b17cc34764
Author: Raphael Geissert <atomo64@gmail.com>
Date: Tue Apr 14 19:38:36 2009 -0500
Fix a failure when there are files with semi colon followed by ELF
The use of semi colon as file's output separator lead the code of
collection/strings, which relied solely on the presence of ELF after the
separator, prone to failure or incorrect results.
diff --git a/collection/strings b/collection/strings
index b324f0c..ceb606c 100755
--- a/collection/strings
+++ b/collection/strings
@@ -27,7 +27,7 @@
[ ! -f elf-index ] || rm -f elf-index
exec >elf-index
-for bin in $(grep ':.*ELF' file-info | cut -d: -f1); do
+for bin in $(sed -rn 's/:\s+\bELF\b.+$//g;T;p' file-info); do
echo "$bin"
case $bin in
/usr/lib/debug/*)
diff --git a/t/tests/strings-elf-detection/debian/debian/dirs b/t/tests/strings-elf-detection/debian/debian/dirs
index d8a79f8..d59b407 100644
--- a/t/tests/strings-elf-detection/debian/debian/dirs
+++ b/t/tests/strings-elf-detection/debian/debian/dirs
@@ -1 +1,2 @@
usr/share/foo/ELF
+usr/lib
diff --git a/t/tests/strings-elf-detection/debian/debian/install b/t/tests/strings-elf-detection/debian/debian/install
index 15691a0..1276ff8 100644
--- a/t/tests/strings-elf-detection/debian/debian/install
+++ b/t/tests/strings-elf-detection/debian/debian/install
@@ -1 +1,4 @@
foo usr/share/foo/ELF/
+bar::ELF usr/share/foo/ELF/
+bar::ELF usr/share/foo/
+true usr/lib/bar::ELF
diff --git a/t/tests/binaries-misplaced/debian/debian/rules b/t/tests/strings-elf-detection/debian/debian/rules
similarity index 50%
copy from t/tests/binaries-misplaced/debian/debian/rules
copy to t/tests/strings-elf-detection/debian/debian/rules
index 7f87ad2..0bc7778 100755
--- a/t/tests/binaries-misplaced/debian/debian/rules
+++ b/t/tests/strings-elf-detection/debian/debian/rules
@@ -1,9 +1,12 @@
#!/usr/bin/make -f
-pkg=binaries-misplaced
%:
dh $@
binary:
dh --before dh_install binary
- mkdir debian/$(pkg)/etc/
- cp -a /bin/true debian/$(pkg)/etc/foo
+ cp /bin/true .
+ touch foo bar::ELF
dh --remaining binary
+
+clean:
+ dh clean
+ $(RM) true foo bar::ELF
diff --git a/t/tests/strings-elf-detection/debian/foo b/t/tests/strings-elf-detection/debian/foo
deleted file mode 100644
index e69de29..0000000
diff --git a/t/tests/strings-elf-detection/desc b/t/tests/strings-elf-detection/desc
index 96c1ef7..dc47125 100644
--- a/t/tests/strings-elf-detection/desc
+++ b/t/tests/strings-elf-detection/desc
@@ -1,4 +1,5 @@
Testname: strings-elf-detection
Sequence: 4500
Version: 1.0
+Architecture: any
Description: Test the ability to detect ELF objects
--
Debian package checker
Reply to: