[Popcon-commits] cvs commit to popularity-contest by ballombe

ballombe at cvs.alioth.debian.org ballombe at cvs.alioth.debian.org
Sat Oct 7 14:32:49 UTC 2006


Update of /cvsroot/popcon/popularity-contest
In directory haydn:/tmp/cvs-serv9471

Modified Files:
	popularity-contest 
Log Message:
Remove support for woody.
Do not report atimes of files in /boot since they are equal to mtimes.


Index: popularity-contest
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/popularity-contest,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- popularity-contest	28 Jul 2006 20:55:25 -0000	1.15
+++ popularity-contest	7 Oct 2006 14:32:46 -0000	1.16
@@ -58,19 +58,8 @@
 my $debarch = `dpkg --print-installation-architecture`;
 chomp $debarch;
 
-# Set if dpkg package version is older than 1.10, thus missing dpkg-query.
-my $olddpkg = 0;
-if ( ! -x "/usr/bin/dpkg-query" ) {
-    $olddpkg = 1;
-}
-
 # Popcon release
-my $popconver;
-if ($olddpkg) {
-    $popconver = `dpkg-awk "Package: *popularity-contest.*" -- Version|grep ^Version|sed 's/^Version: //'`;
-} else {
-    $popconver=`dpkg-query --showformat='\${version}' --show popularity-contest 2>/dev/null`;
-}
+my $popconver=`dpkg-query --showformat='\${version}' --show popularity-contest`;
 
 # Initialise time computations
 
@@ -82,11 +71,8 @@
 my %popcon=();
 
 #Read dpkg database of installed packages
-if ($olddpkg) {
-    open PACKAGES, "dpkg-awk 'Status: .* installed' -- Package | grep '^Package:' | sed 's/^Package: /install ok installed /'|";
-} else {
-    open PACKAGES, "dpkg-query --show --showformat='\${status} \${package}\\n'|";
-}
+
+open PACKAGES, "dpkg-query --show --showformat='\${status} \${package}\\n'|";
 while (<PACKAGES>)
 {
   /^.*installed *(.+)$/ or next;
@@ -97,7 +83,7 @@
   while (<FILES>)
   {
     chop;
-    m{/bin/|/sbin/|^/usr/games/|^/boot/|\.[ah]$|\.pm$} or next;
+    m{/bin/|/sbin/|^/usr/games/|\.[ah]$|\.pm$} or next;
     -f $_ or next;
     my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
                       $atime,$mtime,$ctime,$blksize,$blocks)




More information about the Popcon-commits mailing list