summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-05-26 07:19:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-05-26 07:19:15 +0000
commit8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d (patch)
treea0f0104e8b97ecd605d7f3c20202f4087f108930
parent290364f5c8216dc3c17a2e9446865776df4cd684 (diff)
downloaddrakx-backup-do-not-use-8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d.tar
drakx-backup-do-not-use-8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d.tar.gz
drakx-backup-do-not-use-8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d.tar.bz2
drakx-backup-do-not-use-8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d.tar.xz
drakx-backup-do-not-use-8cc906d65914ff1b7a77cf64c6cf0e4065aacf9d.zip
- enhance script so that we don't have to list bsh
- add bash when DEBUG_INSTALL
-rw-r--r--perl-install/share/list.xml4
-rwxr-xr-xtools/install-xml-file-list2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/share/list.xml b/perl-install/share/list.xml
index 91b289ce4..fb4300739 100644
--- a/perl-install/share/list.xml
+++ b/perl-install/share/list.xml
@@ -1,7 +1,7 @@
<list no-arch-libraries="on">
<from expand="binary">
- ash bsh echo
+ ash echo
cpio gzip bzip2
<if-not ARCH="ppc">
fdisk
@@ -57,7 +57,7 @@
</if>
<if set="DEBUG_INSTALL">
- strace
+ strace bash
</if>
</from>
diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list
index 19bebf616..dbe5169a9 100755
--- a/tools/install-xml-file-list
+++ b/tools/install-xml-file-list
@@ -251,7 +251,7 @@ sub install {
while (1) {
push @files, $f;
my $l = readlink($f) or last;
- if ($l =~ m!/!) {
+ if ($l =~ m!/! && $l !~ m!^\.\..*/s?bin/[^/]+$!) {
warn "keeping symlink $f -> $l as is\n";
last;
}