summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-26 15:26:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-26 15:26:43 +0000
commit371213b0161b8c37837fd9b6ade766765bdd4019 (patch)
tree33b5a1cae71c63950ce4a2febf4b412fa4077307
parent1e6c85b407dedfb930ac4f457b0bf294c768fc48 (diff)
downloaddrakx-371213b0161b8c37837fd9b6ade766765bdd4019.tar
drakx-371213b0161b8c37837fd9b6ade766765bdd4019.tar.gz
drakx-371213b0161b8c37837fd9b6ade766765bdd4019.tar.bz2
drakx-371213b0161b8c37837fd9b6ade766765bdd4019.tar.xz
drakx-371213b0161b8c37837fd9b6ade766765bdd4019.zip
- fix reading rpm macros from /etc/macros.d/ (esp. %_filetriggers_dir)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/pkgs.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 714d5e22a..a3c7743b6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix reading rpm macros from /etc/macros.d/ (esp. %_filetriggers_dir)
+
Version 10.41 - 26 June 2008
- 2009.0 alpha 1 logo
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index bb9effd82..b7c3662f4 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -5,7 +5,7 @@ use strict;
BEGIN {
# needed before "use URPM"
mkdir '/etc/rpm';
- symlink "/tmp/stage2/etc/rpm/$_", "/etc/rpm/$_" foreach 'platform', 'macros.cdb';
+ symlink "/tmp/stage2/etc/rpm/$_", "/etc/rpm/$_" foreach 'macros.d';
}
use URPM;