Commit 80a84b87 authored by Bernhard Link's avatar Bernhard Link

fix a couple of spelling mistakes (thanks spelllintian)

parent 3d5f34a8
......@@ -418,7 +418,7 @@ retvalue chunk_getnameandversion(const char *chunk, const char *name, char **pkg
name);
else
fprintf(stderr,
"Error: Field '%s' has multipe words after '('!\n",
"Error: Field '%s' has multiple words after '('!\n",
name);
return RET_ERROR;
}
......
......@@ -577,7 +577,7 @@ static retvalue readline(/*@out@*/char **result, FILE *f, const char *versionfil
buffer[--l] = '\0';
}
if (l == 0) {
fprintf(stderr, "Error reading '%s': unexpcted empty line.\n",
fprintf(stderr, "Error reading '%s': unexpected empty line.\n",
versionfilename);
return RET_ERROR;
}
......
......@@ -222,7 +222,7 @@ option, if you do not want some of the files pointed to by the untouched index
files to vanish.
.TP
.BR \-\-export=silent-never
Like never, but supress most output about that.
Like never, but suppress most output about that.
.TP
.B \-\-ignore=\fIwhat\fP
Ignore errors of type \fIwhat\fP. See the section \fBERROR IGNORING\fP
......@@ -241,7 +241,7 @@ If nothing was done, return with exitcode 1 instead of the usual 0.
Note that "nothing was done" means the primary purpose of the action
in question.
Auxilary actions (opening and closeing the database, exporting missing
Auxiliary actions (opening and closing the database, exporting missing
files with \-\-export=lookedat, ...) usually do not count.
Also note that this is not very well tested.
If you find an action that claims to have done something in some cases
......@@ -658,7 +658,7 @@ lists all packages with names starting with \fBlinux\-\fP and later
having an \fB\-2.6\fP.
.TP
.B ls \fIpackage-name\fP
List the versions of the the specified package in all distributions.
List the versions of the specified package in all distributions.
.TP
.B lsbycomponent \fIpackage-name\fP
Like ls, but group by component (and print component names).
......@@ -1869,7 +1869,7 @@ Reprepro will try the first supported variant in the list given:
Only compressions compiled in or for which an uncompressor was found
are used.
Unless the value starts with \fBforce.\fP,
it is only tried if if is found in the Release or InRelease file.
it is only tried if is found in the Release or InRelease file.
The default value is \fB.diff .xz .lzma .bz2 .gz .\fP, i.e.
download Packages.diff if listed in the Release file,
......@@ -2466,7 +2466,7 @@ Changes files can have files with section 'byhand' (Debian) or 'raw\-' (Ubuntu).
Those files are not packages but other data generated (usually together with
packages) and then uploaded together with this changes files.
With reprepro those can be stored in the pool next to their packages whith
With reprepro those can be stored in the pool next to their packages with
tracking, put in some log directory when using processincoming, or given to
an hook script (currently only possible with processincoming).
.TP
......
......@@ -82,7 +82,7 @@ enum optionsflags {
/* only put _all.deb comes with those of some architecture,
* only put in those architectures */
iof_limit_arch_all = 0,
/* allow .changes file to specify multipe distributions */
/* allow .changes file to specify multiple distributions */
iof_multiple_distributions,
iof_COUNT /* must be last */
};
......
......@@ -271,7 +271,7 @@ bool indexfile_getnext(struct indexfile *f, struct package *pkgout, struct targe
f->linenumber);
if (ignored[IGN_wrongarchitecture] == 0) {
fprintf(stderr,
"This either mean the repository you get packages from is of an extremly\n"
"This either mean the repository you get packages from is of an extremely\n"
"low quality, or something went wrong. Trying to ignore it now, though.\n"
"To no longer get this message use '--ignore=wrongarchitecture'.\n");
}
......
......@@ -362,7 +362,7 @@ static retvalue notificator_parse(struct notificator *n, struct configiterator *
*value_p = atom_find(value_type, argument);
if (!atom_defined(*value_p)) {
fprintf(stderr,
"Warning: unknown %s '%s', ignoring notificator line line %u in %s\n",
"Warning: unknown %s '%s', ignoring notificator line at line %u in %s\n",
atomtypes[value_type],
argument, config_line(iter),
config_filename(iter));
......
......@@ -1116,7 +1116,7 @@ static retvalue handle_diff(const char *directory, const char *mode, const char
/* if the diff is bigger than the new file,
* there is no point in not getting the full file.
* And as in all but extremly strange situations this
* And as in all but extremely strange situations this
* also means all older patches will get bigger when merged,
* do not even bother to calculate them but remove all. */
if (root->hash.len > newhash.len) {
......
......@@ -621,7 +621,7 @@ static inline retvalue verify_signature(const struct signature_requirement *requ
}
for (req = requirements ; req != NULL ; req = req->next) {
bool fullfilled = false;
bool fulfilled = false;
/* check first for good signatures, and then for good enough
signatures, to not pester the user with warnings of one
......@@ -630,28 +630,28 @@ static inline retvalue verify_signature(const struct signature_requirement *requ
for (i = 0 ; (size_t)i < req->num_keys ; i++) {
if (key_good(&req->keys[i], result->signatures)) {
fullfilled = true;
fulfilled = true;
break;
}
}
for (i = 0 ; !fullfilled && (size_t)i < req->num_keys ; i++) {
for (i = 0 ; !fulfilled && (size_t)i < req->num_keys ; i++) {
if (key_good_enough(&req->keys[i], result->signatures,
releasegpg, releasename)) {
fullfilled = true;
fulfilled = true;
break;
}
}
if (!fullfilled) {
if (!fulfilled) {
fprintf(stderr,
"ERROR: Condition '%s' not fullfilled for '%s'.\n",
"ERROR: Condition '%s' not fulfilled for '%s'.\n",
req->condition, releasegpg);
print_signatures(stderr, result->signatures,
releasegpg);
return RET_ERROR_BADSIG;
}
if (verbose > 10) {
fprintf(stdout, "Condition '%s' fullfilled for '%s'.\n",
fprintf(stdout, "Condition '%s' fulfilled for '%s'.\n",
req->condition, releasegpg);
}
}
......
......@@ -23,7 +23,7 @@ mkdir logs
testrun - -b . export 3<<EOF
stderr
*=Warning: unknown architecture 'nonexistant', ignoring notificator line line 5 in ./conf/distributions
*=Warning: unknown architecture 'nonexistant', ignoring notificator line at line 5 in ./conf/distributions
stdout
$(odb)
-v1*=Exporting B...
......@@ -76,7 +76,7 @@ touch importindex
testrun - -b . _addpackage B importindex bar foo 3<<EOF
returns 255
stderr
*=Warning: unknown component 'nocomponent', ignoring notificator line line 5 in ./conf/distributions
*=Warning: unknown component 'nocomponent', ignoring notificator line at line 5 in ./conf/distributions
*=_addpackage needs -C and -A and -T set!
-v0*=There have been errors!
EOF
......@@ -90,7 +90,7 @@ EOF
testrun - -b . -A source -T dsc _addpackage B importindex bar foo 3<<EOF
returns 255
stderr
*=Warning: unknown packagetype 'none', ignoring notificator line line 5 in ./conf/distributions
*=Warning: unknown packagetype 'none', ignoring notificator line at line 5 in ./conf/distributions
*=_addpackage needs -C and -A and -T set!
-v0*=There have been errors!
EOF
......
......@@ -55,7 +55,7 @@ dodo mv tracking.db db/
testrun - --keepunreferenced removesrc breakme aa 3<<EOF
stderr
*=Warning: tracking data might be incosistent:
*=Warning: tracking data might be inconsistent:
*=cannot find 'aa' in 'breakme|something|abacus', but 'pool/something/a/aa/aa_1-1_abacus.deb' should be there.
*=cannot find 'aa' in 'breakme|something|source', but 'pool/something/a/aa/aa_1-1.dsc' should be there.
*=There was an inconsistency in the tracking data of 'breakme':
......
......@@ -145,7 +145,7 @@ stderr
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=Not accepting valid signature in './lists/commonbase_test_InRelease' with REVOKED '12D6C95C8C737389EAAF535972F1D61F685AF714'
*=(To ignore it append a ! to the key and run reprepro with --ignore=revokedkey)
*=ERROR: Condition '685AF714!|D04DD3D6!' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition '685AF714!|D04DD3D6!' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -173,7 +173,7 @@ return 250
stderr
-v1*=aptmethod got 'file:${WORKDIR}/test/dists/test/InRelease'
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=ERROR: Condition '685AF714!|D04DD3D6!' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition '685AF714!|D04DD3D6!' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -205,7 +205,7 @@ return 250
stderr
-v1*=aptmethod got 'file:${WORKDIR}/test/dists/test/InRelease'
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=ERROR: Condition '685AF714!|D04DD3D6!' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition '685AF714!|D04DD3D6!' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -236,7 +236,7 @@ return 250
stderr
-v1*=aptmethod got 'file:${WORKDIR}/test/dists/test/InRelease'
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=ERROR: Condition 'F62C6D3B' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition 'F62C6D3B' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -281,7 +281,7 @@ stderr
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=Not accepting valid signature in './lists/commonbase_test_InRelease' with EXPIRED 'DCAD3A286F5178E2F4B09330A573FEB160DDED5B'
*=(To ignore it append a ! to the key and run reprepro with --ignore=expiredkey)
*=ERROR: Condition '60DDED5B!' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition '60DDED5B!' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -314,7 +314,7 @@ stderr
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=Not accepting valid signature in './lists/commonbase_test_InRelease' with EXPIRED 'DCAD3A286F5178E2F4B09330A573FEB160DDED5B'
*=(To ignore it append a ! to the key and run reprepro with --ignore=expiredkey)
*=ERROR: Condition 'A260449A!+' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition 'A260449A!+' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='DCAD3A286F5178E2F4B09330A573FEB160DDED5B' (signed ${CURDATE}): expired key
*='236B4B98B5087AF4B621CB14D8A28B7FD7A5D887' (signed ${CURDATE}): valid
......@@ -332,7 +332,7 @@ return 250
stderr
-v1*=aptmethod got 'file:${WORKDIR}/test/dists/test/InRelease'
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=ERROR: Condition 'A260449A!+' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition 'A260449A!+' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='FDC7D039CCC83CC4921112A09FA943670C672A4A' (signed ${CURDATE}): valid
*=Error: Not enough signatures found for remote repository commonbase (file:${WORKDIR}/test test)!
......@@ -382,7 +382,7 @@ stderr
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=Not accepting valid but EXPIRED signature in './lists/commonbase_test_InRelease' with '2938A0D8CD4E20437CAE9CE4154F637BF62C6D3B'
*=(To ignore it append a ! to the key and run reprepro with --ignore=expiredsignature)
*=ERROR: Condition 'F62C6D3B+' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition 'F62C6D3B+' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='2938A0D8CD4E20437CAE9CE4154F637BF62C6D3B' (signed 2012-05-21): expired signature (since 2012-05-22)
*=Error: Not enough signatures found for remote repository commonbase (file:${WORKDIR}/test test)!
......@@ -397,7 +397,7 @@ stderr
-v2*=Copy file '${WORKDIR}/test/dists/test/InRelease' to './lists/commonbase_test_InRelease'...
*=Not accepting valid but EXPIRED signature in './lists/commonbase_test_InRelease' with '2938A0D8CD4E20437CAE9CE4154F637BF62C6D3B'
*=(To ignore it append a ! to the key and run reprepro with --ignore=expiredsignature)
*=ERROR: Condition 'F62C6D3B+' not fullfilled for './lists/commonbase_test_InRelease'.
*=ERROR: Condition 'F62C6D3B+' not fulfilled for './lists/commonbase_test_InRelease'.
*=Signatures in './lists/commonbase_test_InRelease':
*='2938A0D8CD4E20437CAE9CE4154F637BF62C6D3B' (signed 2012-05-21): expired signature (since 2012-05-22)
*=Error: Not enough signatures found for remote repository commonbase (file:${WORKDIR}/test test)!
......
......@@ -1255,7 +1255,7 @@ static retvalue targetremovesourcepackage(trackingdb t, struct trackedpackage *p
if (pkg->filetypes[i] != ft_ALL_BINARY
&& verbose >= -1) {
fprintf(stderr,
"Warning: tracking data might be incosistent:\n"
"Warning: tracking data might be inconsistent:\n"
"cannot find '%s' in '%s', but '%s' should be there.\n",
packagename, target->identifier,
filekey);
......@@ -1277,7 +1277,7 @@ static retvalue targetremovesourcepackage(trackingdb t, struct trackedpackage *p
if (pkg->filetypes[i] != ft_ALL_BINARY
&& verbose >= -1) {
fprintf(stderr,
"Warning: tracking data might be incosistent:\n"
"Warning: tracking data might be inconsistent:\n"
"'%s' has '%s' of source '%s', but source '%s' contains '%s'.\n",
target->identifier, package.name,
package.source, pkg->sourcename,
......@@ -1290,7 +1290,7 @@ static retvalue targetremovesourcepackage(trackingdb t, struct trackedpackage *p
if (pkg->filetypes[i] != ft_ALL_BINARY
&& verbose >= -1) {
fprintf(stderr,
"Warning: tracking data might be incosistent:\n"
"Warning: tracking data might be inconsistent:\n"
"'%s' has '%s' of source version '%s', but version '%s' contains '%s'.\n",
target->identifier, package.name,
package.sourceversion,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment