summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-28 16:54:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-28 16:54:05 +0000
commitdcc8f57472d251ddd51b94a2f140273a68ad3227 (patch)
tree7caafbaf7fdc51efd8e1b0675b04650baaec1c49
parent20062002d49e3526920c3261b6d99e97c2d61e62 (diff)
downloadurpmi-dcc8f57472d251ddd51b94a2f140273a68ad3227.tar
urpmi-dcc8f57472d251ddd51b94a2f140273a68ad3227.tar.gz
urpmi-dcc8f57472d251ddd51b94a2f140273a68ad3227.tar.bz2
urpmi-dcc8f57472d251ddd51b94a2f140273a68ad3227.tar.xz
urpmi-dcc8f57472d251ddd51b94a2f140273a68ad3227.zip
no_comment
-rw-r--r--ChangeLog5
-rw-r--r--autoirpm.update-all.cc2
-rwxr-xr-xurpmi1
-rw-r--r--urpmi.spec5
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index febabbab..61365cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-28 Pixel <pixel@mandrakesoft.com>
+
+ * autoirpm.update-all.cc: s/FILENAMES/OLDFILENAMES/
+ * urpmi: unset $BASH_ENV
+
2000-02-10 Pixel <pixel@mandrakesoft.com>
* urpmi: unset $ENV to please -U
diff --git a/autoirpm.update-all.cc b/autoirpm.update-all.cc
index 3d13899e..90b524e0 100644
--- a/autoirpm.update-all.cc
+++ b/autoirpm.update-all.cc
@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
headerGetEntry(header, RPMTAG_NAME, &type, (void **) &name, &count);
headerGetEntry(header, RPMTAG_FILEMODES, &type, (void **) &p, &count);
- headerGetEntry(header, RPMTAG_FILENAMES, &type, (void **) &f, &count);
+ headerGetEntry(header, RPMTAG_OLDFILENAMES, &type, (void **) &f, &count);
for (; count--; *p++, *f++)
if ((*p & 040111) == 0111 &&
(s = strrchr(*f, '/')) &&
diff --git a/urpmi b/urpmi
index 9c254a3a..65deb7a2 100755
--- a/urpmi
+++ b/urpmi
@@ -4,6 +4,7 @@ load_po();
$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
delete $ENV{ENV};
+delete $ENV{BASH_ENV};
$< = $>;
log_it(scalar localtime, " urpmi called with @ARGV\n");
diff --git a/urpmi.spec b/urpmi.spec
index 204d7623..ee8e74b8 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 1.0
-Release: 1mdk
+Release: 2mdk
License: GPL
Source0: %{name}.tar.bz2
Summary: User mode rpm install
@@ -17,6 +17,9 @@ well-known rpms to be installed.
You can compare rpm vs. urpmi with insmod vs. modprobe
%changelog
+* Mon Feb 28 2000 Pixel <pixel@mandrakesoft.com> 1.0-2mdk
+- unset $BASH_ENV
+
* Sat Feb 12 2000 Pixel <pixel@mandrakesoft.com> 1.0-1mdk
- 1.0
- small urpmi man page change