From 6fab850d5e4f580322fdf6347ffedc2eaa2b29e7 Mon Sep 17 00:00:00 2001 From: Alexey Tourbin Date: Wed, 4 Jun 2008 13:54:36 +0400 Subject: [PATCH] s/relocateable/relocatable/ (jbj) --- CHANGES | 10 +++++----- doc/manual/relocatable | 2 +- doc/rpm.8 | 2 +- lib/package.c | 2 +- lib/poptI.c | 2 +- lib/problems.c | 2 +- lib/psm.c | 2 +- lib/rpminstall.c | 2 +- lib/rpmlib.h | 2 +- po/rpm.pot | 6 +++--- po/ru.po | 6 +++--- rpmpopt.in | 6 +++--- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index 5018cf2..84c76f0 100644 --- a/CHANGES +++ b/CHANGES @@ -382,7 +382,7 @@ - better item/task progress bars . - load headers as single contiguous region. - add region marker as RPM_BIN_TYPE in packages and database. - - fix: don't headerCopy() relocateable packages if not relocating. + - fix: don't headerCopy() relocatable packages if not relocating. - merge signatures into header after reading from package. - RPM_BIN_TYPE malloc'ed when retrieved through headerGetEntry(). - add headerFreeData() to free any data malloc'ed during retrieval. @@ -1218,7 +1218,7 @@ - implemented generic file relocations at install time (use --relocate =, i.e. --relocate /usr=/foo) - added --badreloc flag to force RPM to relocate files which packages - haven't advertised as relocateable + haven't advertised as relocatable - fix return code on failed uncompresses in %prep - preliminary handling of bzip2 compressed files - differentiates between big and little endian mips @@ -1599,9 +1599,9 @@ - made verify verify owner and groups by name rather then by id -- if the symbolic names aren't available use the uids - cleaned up relocateFilelist() and related code thanks to - new header introduced in 2.3.3 -- this could break relocateable + new header introduced in 2.3.3 -- this could break relocatable packages but they seem okay - - fixed a bug which could cause relocateable packages to not get + - fixed a bug which could cause relocatable packages to not get relocated -- I think this bit some people during hard drive installs of all things (Jason Salopek pestered me consistently enough to keep this on the front burner for me) @@ -1886,7 +1886,7 @@ - changed man page for readability (thanks to Joseph L. Hartmann, Jr) 2.1.1 -> 2.1.2: - - fixed error message for unrelocateable packages + - fixed error message for unrelocatable packages - automatic shared lib provides now work with buildprefix - fixed dependency checking during upgrades to work if the package wasn't previously installed diff --git a/doc/manual/relocatable b/doc/manual/relocatable index c4bdd41..6168c1c 100644 --- a/doc/manual/relocatable +++ b/doc/manual/relocatable @@ -1,4 +1,4 @@ -/*! \page relocateable Relocateable packages +/*! \page relocatable Relocateable packages Relocatable packages are a way to give the user a little control over the installation location of a package. For example, a vendor diff --git a/doc/rpm.8 b/doc/rpm.8 index 5850229..96056f3 100644 --- a/doc/rpm.8 +++ b/doc/rpm.8 @@ -285,7 +285,7 @@ This is intended to make \fBrpm\fR easy to run from other tools. .TP \fB--prefix \fINEWPATH\fB\fR -For relocateable binary packages, translate all file paths that +For relocatable binary packages, translate all file paths that start with the installation prefix in the package relocation hint(s) to \fINEWPATH\fR. .TP diff --git a/lib/package.c b/lib/package.c index b734bd8..4be66b0 100644 --- a/lib/package.c +++ b/lib/package.c @@ -198,7 +198,7 @@ static rpmRC readPackageHeaders(FD_t fd, (void) headerRemoveEntry(*hdr, RPMTAG_FILEGIDS); /* - * We switched the way we do relocateable packages. We fix some of + * We switched the way we do relocatable packages. We fix some of * it up here, though the install code still has to be a bit * careful. This fixup makes queries give the new values though, * which is quite handy. diff --git a/lib/poptI.c b/lib/poptI.c index 6976b5b..a2fb437 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -115,7 +115,7 @@ struct poptOption rpmInstallPoptTable[] = { { "badreloc", '\0', POPT_BIT_SET, &rpmIArgs.probFilter, RPMPROB_FILTER_FORCERELOCATE, - N_("relocate files in non-relocateable package"), NULL}, + N_("relocate files in non-relocatable package"), NULL}, { "chainsaw", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags, RPMTRANS_FLAG_CHAINSAW, N_("use chainsaw dependency tree decimation when ordering"), NULL}, diff --git a/lib/problems.c b/lib/problems.c index fc8cabe..74947ee 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -142,7 +142,7 @@ const char * rpmProblemString(const rpmProblem prob) break; case RPMPROB_BADRELOCATE: rc = snprintf(buf, nb, - _("path %s in package %s is not relocateable"), + _("path %s in package %s is not relocatable"), str1, pkgNEVR); break; case RPMPROB_NEW_FILE_CONFLICT: diff --git a/lib/psm.c b/lib/psm.c index 0166b5c..b08e7e8 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1474,7 +1474,7 @@ assert(psm->mi == NULL); if (ts->transFlags & RPMTRANS_FLAG_JUSTDB) break; /* - * Old format relocateable packages need the entire default + * Old format relocatable packages need the entire default * prefix stripped to form the cpio list, while all other packages * need the leading / stripped. */ diff --git a/lib/rpminstall.c b/lib/rpminstall.c index b27c0b4..d715109 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -469,7 +469,7 @@ restart: const char * name; xx = headerNVR(eiu->h, &name, NULL, NULL); rpmMessage(RPMMESS_ERROR, - _("package %s is not relocateable\n"), name); + _("package %s is not relocatable\n"), name); eiu->numFailed++; goto exit; /*@notreached@*/ diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 3d387fe..ab277bb 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -990,7 +990,7 @@ typedef enum rpmProblemType_e { RPMPROB_BADARCH, /*!< package ... is for a different architecture */ RPMPROB_BADOS, /*!< package ... is for a different operating system */ RPMPROB_PKG_INSTALLED, /*!< package ... is already installed */ - RPMPROB_BADRELOCATE,/*!< path ... is not relocateable for package ... */ + RPMPROB_BADRELOCATE,/*!< path ... is not relocatable for package ... */ RPMPROB_REQUIRES, /*!< package ... has unsatisfied Requires: ... */ RPMPROB_CONFLICT, /*!< package ... has unsatisfied Conflicts: ... */ RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */ diff --git a/po/rpm.pot b/po/rpm.pot index 92b7469..a63fc3a 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -552,7 +552,7 @@ msgid "relocate files from to " msgstr "" #: lib/poptI.c:116 rpm.c:434 -msgid "relocate files in non-relocateable package" +msgid "relocate files in non-relocatable package" msgstr "" #: rpm.c:435 @@ -2795,7 +2795,7 @@ msgstr "" #: lib/problems.c:145 #, c-format -msgid "path %s in package %s is not relocateable" +msgid "path %s in package %s is not relocatable" msgstr "" #: lib/problems.c:150 @@ -3162,7 +3162,7 @@ msgstr "" #: lib/rpminstall.c:396 #, c-format -msgid "package %s is not relocateable\n" +msgid "package %s is not relocatable\n" msgstr "" #: lib/rpminstall.c:445 diff --git a/po/ru.po b/po/ru.po index 89ad910..4928c48 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1846,7 +1846,7 @@ msgid "do not execute package scriptlet(s)" msgstr "не исполнять никаких сценариев пакета(ов)" #: lib/poptI.c:118 -msgid "relocate files in non-relocateable package" +msgid "relocate files in non-relocatable package" msgstr "переместить файлы в неперемещаемом пакете" #: lib/poptI.c:121 @@ -2241,7 +2241,7 @@ msgstr " #: lib/problems.c:145 #, c-format -msgid "path %s in package %s is not relocateable" +msgid "path %s in package %s is not relocatable" msgstr "путь %s в пакете %s - не перемещаемый" #: lib/problems.c:150 @@ -2613,7 +2613,7 @@ msgstr " #: lib/rpminstall.c:464 #, c-format -msgid "package %s is not relocateable\n" +msgid "package %s is not relocatable\n" msgstr "пакет %s - не перемещаемый\n" #: lib/rpminstall.c:513 diff --git a/rpmpopt.in b/rpmpopt.in index 963d44f..40b7153 100644 --- a/rpmpopt.in +++ b/rpmpopt.in @@ -58,7 +58,7 @@ rpm alias --requires -q --qf \ --POPTdesc=$"list capabilities required by package(s)" rpm alias -R --requires -rpm alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\ +rpm alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\ Version : %-27{VERSION} Vendor: %{VENDOR}\n\ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\ @@ -335,7 +335,7 @@ rpmq alias --requires -q --qf \ --POPTdesc=$"list capabilities required by package(s)" rpmq alias -R --requires -rpmq alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\ +rpmq alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\ Version : %-27{VERSION} Vendor: %{VENDOR}\n\ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\ @@ -431,7 +431,7 @@ rpmquery alias --requires -q --qf \ --POPTdesc=$"list capabilities required by package(s)" rpmquery alias -R --requires -rpmquery alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocateable)}|\n\ +rpmquery alias --info -q --qf 'Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|\n\ Version : %-27{VERSION} Vendor: %{VENDOR}\n\ Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}\n\ Install date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}\n\