Merge commit 'alioth/master' into debian-master

[deb/packages.git] / bin / extract_files

diff --git a/bin/extract_files b/bin/extract_files
index 49b489f24d1b8153bc9d56462fe7650225f30e8e..79b99467ac39f6dc659521fd7f8e131474f72c2d 100755 (executable)
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -234,8 +234,8 @@ sub to_update {
 
     if ($config_data->{structure} == PKGPOOL) {
        my $dir = "$target/".pkg_pool_directory( $pkg_data );
-       if (!$force && -d $dir && -f "$dir/log") {
-           touch("$dir/log")
+       if (!$force && -f "$dir/log") {
+           (utime(undef,undef,"$dir/log") == 1)
                or do_warning( "touch of $dir/log failed" );
            return 0;
        } else {
@@ -564,6 +564,10 @@ sub read_deb {
        }
     }
     $cache{$debname} ||= qx/dpkg-deb --info "$debname" control/;
+    unless ( $cache{$debname} ) {
+       do_warning( "extracting control information of file $debname failed" );
+       return;
+    }
     my $control = $cache{$debname};
 
     unless ( $raw_data = $parser->parse_mem( $control,