diff options
| author | jbj <devnull@localhost> | 2000-01-05 19:46:45 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2000-01-05 19:46:45 +0000 |
| commit | 98dd6f2c02a0c7d4d56b7793324fb41bad295946 (patch) | |
| tree | 9d7aeed98ea256fa4d8e57fca49f48f3a1b73aff | |
| parent | 8d76e5e019c15c43c91e23fe5e878dcce7ff0ada (diff) | |
| download | rpm-98dd6f2c02a0c7d4d56b7793324fb41bad295946.tar.gz rpm-98dd6f2c02a0c7d4d56b7793324fb41bad295946.tar.bz2 rpm-98dd6f2c02a0c7d4d56b7793324fb41bad295946.zip | |
resurrect failed glob error message during build
CVS patchset: 3509
CVS date: 2000/01/05 19:46:45
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | build/files.c | 5 | ||||
| -rw-r--r-- | po/rpm.pot | 27 | ||||
| -rw-r--r-- | rpm.spec | 3 |
4 files changed, 22 insertions, 14 deletions
@@ -34,6 +34,7 @@ - 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 and with O_WRONLY(=1), not O_RDONLY(=0). + - fix: resurrect failed glob error message during build. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. diff --git a/build/files.c b/build/files.c index 4278521aa..a87607787 100644 --- a/build/files.c +++ b/build/files.c @@ -1105,12 +1105,15 @@ fprintf(stderr, "*** PBF fileURL %s\n", fileURL); int i; rc = rpmGlob(diskURL, &argc, &argv); - if (rc == 0) { + if (rc == 0 && argc >= 1 && !myGlobPatternP(argv[0])) { for (i = 0; i < argc; i++) { rc = addFile(fl, argv[i], NULL); xfree(argv[i]); } xfree(argv); + } else { + rpmError(RPMERR_BADSPEC, _("File not found by glob: %s"), diskURL); + rc = 1; } } else { rc = addFile(fl, diskURL, NULL); diff --git a/po/rpm.pot b/po/rpm.pot index 8d427d9fb..c16825799 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-04 08:10-0500\n" +"POT-Creation-Date: 2000-01-05 15:54-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" @@ -1412,52 +1412,57 @@ msgstr "" msgid "File needs leading \"/\": %s" msgstr "" -#: build/files.c:1154 +#: build/files.c:1115 +#, c-format +msgid "File not found by glob: %s" +msgstr "" + +#: build/files.c:1157 msgid "Could not open %%files file %s: %s" msgstr "" -#: build/files.c:1161 build/pack.c:481 +#: build/files.c:1164 build/pack.c:481 #, c-format msgid "line: %s" msgstr "" -#: build/files.c:1495 build/parsePrep.c:30 +#: build/files.c:1498 build/parsePrep.c:30 #, c-format msgid "Bad owner/group: %s" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:1550 +#: build/files.c:1553 #, c-format msgid "Couldn't exec %s: %s" msgstr "" -#: build/files.c:1555 +#: build/files.c:1558 #, c-format msgid "Couldn't fork %s: %s" msgstr "" -#: build/files.c:1637 +#: build/files.c:1640 #, c-format msgid "%s failed" msgstr "" -#: build/files.c:1641 +#: build/files.c:1644 #, c-format msgid "failed to write all data to %s" msgstr "" -#: build/files.c:1730 +#: build/files.c:1733 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:1758 build/files.c:1767 +#: build/files.c:1761 build/files.c:1770 #, c-format msgid "Failed to find %s:" msgstr "" -#: build/files.c:1873 +#: build/files.c:1876 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -2,7 +2,7 @@ Summary: The Red Hat package management system. Name: rpm %define version 3.0.4 Version: %{version} -Release: 0.28 +Release: 0.29 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz Copyright: GPL @@ -167,4 +167,3 @@ fi /usr/lib/libpopt.la /usr/lib/libpopt.so /usr/include/popt.h - |