summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:17:54 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-07-14 19:17:54 +0000
commit82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004 (patch)
tree6ea72d942008265d8be6d1364fac3141e8a333cb
parent5d70e0b5c8db3e8c1c83ced00539c870044e1a0d (diff)
downloaddrakx-82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004.tar
drakx-82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004.tar.gz
drakx-82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004.tar.bz2
drakx-82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004.tar.xz
drakx-82b8f4c27ec8e4ee8ae8f4b0ead97177d05f4004.zip
support new 2.5.x kernels' kbuild
-rwxr-xr-xperl-install/standalone/drakfloppy4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index 4a6da3fcd..3a7333c06 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -256,7 +256,7 @@ sub expand_tree {
foreach my $dir_entry (all($dir)) {
my $entry_path = $dir . "/" . $dir_entry;
- if (-d $entry_path || $dir_entry =~ /\.o(\.gz)?$/) {
+ if (-d $entry_path || $dir_entry =~ /\.(k|)o(\.gz)?$/) {
$entry_path =~ s|//|/|g;
my $iter = $tree_model->append_set($parent_iter, [ 0 => $dir_entry, 1 => $entry_path, 2 => has_sub_trees($entry_path) ]);
#- hackery for partial displaying of trees, used in rpmdrake:
@@ -325,7 +325,7 @@ sub has_sub_trees {
my ($dir) = @_;
foreach my $file (glob_("$dir/*")) {
- return 1 if -d $file || $file =~ /\.o(\.gz)?$/;
+ return 1 if -d $file || $file =~ /\.(k|)o(\.gz)?$/;
}
return 0;