summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--lib/rpmchecksig.c2
-rw-r--r--po/rpm.pot30
-rw-r--r--rpm.spec2
4 files changed, 18 insertions, 17 deletions
diff --git a/CHANGES b/CHANGES
index 327000fe0..ad8af747d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,7 @@
- split python bindings into a separate sub-package of rpm.
- add ja translation and man pages (Kanda Mitsuru kanda@nn.iij4u.or.jp).
- fix: fp.subDir was incorrectly set to NULL in sparse chroot's.
+ - fix: manageFile needs to check O_WRONLY(=1), not O_RDONLY(=0).
3.0.2 -> 3.0.3
- add --eval to find result of macro expansion.
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index ecd22e3bb..053a4cd1a 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -26,7 +26,7 @@ static int manageFile(FD_t *fdp, const char **fnp, int flags, int rc)
/* open a file and set *fdp */
if (*fdp == NULL && fnp && *fnp) {
- fd = Fopen(*fnp, ((flags & O_RDONLY) ? "r.ufdio" : "r+.ufdio"));
+ fd = Fopen(*fnp, ((flags & O_WRONLY) ? "r+.ufdio" : "r.ufdio"));
if (fd == NULL || Ferror(fd)) {
fprintf(stderr, _("%s: open failed: %s\n"), *fnp,
Fstrerror(fd));
diff --git a/po/rpm.pot b/po/rpm.pot
index 3a5761e00..a40e345ed 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-03 13:27-0500\n"
+"POT-Creation-Date: 2000-01-03 14:31-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3032,59 +3032,59 @@ msgstr ""
msgid "Installing %s\n"
msgstr ""
-#: lib/rpmio.c:771
+#: lib/rpmio.c:774
msgid "Success"
msgstr ""
-#: lib/rpmio.c:774
+#: lib/rpmio.c:777
msgid "Bad server response"
msgstr ""
-#: lib/rpmio.c:777
+#: lib/rpmio.c:780
msgid "Server IO error"
msgstr ""
-#: lib/rpmio.c:780
+#: lib/rpmio.c:783
msgid "Server timeout"
msgstr ""
-#: lib/rpmio.c:783
+#: lib/rpmio.c:786
msgid "Unable to lookup server host address"
msgstr ""
-#: lib/rpmio.c:786
+#: lib/rpmio.c:789
msgid "Unable to lookup server host name"
msgstr ""
-#: lib/rpmio.c:789
+#: lib/rpmio.c:792
msgid "Failed to connect to server"
msgstr ""
-#: lib/rpmio.c:792
+#: lib/rpmio.c:795
msgid "Failed to establish data connection to server"
msgstr ""
-#: lib/rpmio.c:795
+#: lib/rpmio.c:798
msgid "IO error to local file"
msgstr ""
-#: lib/rpmio.c:798
+#: lib/rpmio.c:801
msgid "Error setting remote server to passive mode"
msgstr ""
-#: lib/rpmio.c:801
+#: lib/rpmio.c:804
msgid "File not found on server"
msgstr ""
-#: lib/rpmio.c:804
+#: lib/rpmio.c:807
msgid "Abort in progress"
msgstr ""
-#: lib/rpmio.c:808
+#: lib/rpmio.c:811
msgid "Unknown or unexpected error"
msgstr ""
-#: lib/rpmio.c:1341
+#: lib/rpmio.c:1344
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 66f9c3c96..13fa1efd2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
Name: rpm
%define version 3.0.4
Version: %{version}
-Release: 0.26
+Release: 0.27
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
Copyright: GPL