Commit 15180376 authored by Bernhard Link's avatar Bernhard Link

fix more spelling mistakes

parent 7d75abe0
......@@ -523,7 +523,7 @@
IgnoreRelease.
* Handle apt transport methods returning missing files as
success with alternate filename suggestion more gracefully.
* when getting packages from an other architecture while updating,
* when getting packages from another architecture while updating,
ignore all packages with architecture not fitting into the target.
(Fixes a regression introduced in 3.8.0)
2009-10-21
......
......@@ -20,7 +20,7 @@ Updates between 4.17.0 and 4.17.1:
Updates between 4.16.1 and 4.17.0:
- some manpage fixes
- '#' in filterlists are comments
- fix parsing of strangly formated control files
- fix parsing of strangly formatted control files
- add Exportoptions: noexport option in conf/distributions
- add Permit: unlisted_binary option in conf/incoming
- -dbgsym are not differently looked for in changes' Binary field
......@@ -93,7 +93,7 @@ Updates between 4.9.0 and 4.10.0:
- improve changelogs.example (CHANGELOGDIR empty stored directly in pool/)
Updates between 4.8.2 and 4.9.0:
- build-needing now allows to look for things for 'all' and 'any'
- build-needing now allows one to look for things for 'all' and 'any'
- improve error messages when parsing config files
- uploader files now can 'include' other files.
......@@ -222,7 +222,7 @@ Updates between 3.10.0 and 3.11.0:
Updates between 3.9.2 and 3.10.0:
- fix bug of ListHook not used if in the From: rule of a rule.
- add ListShelllHook
- add _listdbidentifers and _listconfidentifiers
- add _listdbidentifiers and _listconfidentifiers
- add --list-format to change format of list and listfilter
+ rewrite Release.gpg verification code:
- more hops needed to use expired or revoked keys
......@@ -255,7 +255,7 @@ Updates between 3.8.2 and 3.9.0:
- new 'warning' state for FilterList
- set REPREPRO_FROM and REPREPRO_CAUSING_RULE in some log notifiers
+ bug fixes:
- reenable workaround for apt-methods having problem with existing
- re-enable workaround for apt-methods having problem with existing
files which got lost in 3.8
- fix bug not looking at DownloadListsAs in all cases
- bugfix in misparsing some .diff files for section/priority retrieval
......@@ -447,7 +447,7 @@ Updates between 2.2.4 and 3.0.0:
- added db/version file to document database format
(so future versions can warn about incompatibilities)
- cleaned up tracking handling a bit:
* retrack no longer created tracking data for distribtions without tracking
* retrack no longer created tracking data for distributions without tracking
* retrack only recreates usage data, not all data
(so .changes files and old versions are no longer lost when run)
also references from tracking data are now refreshed by rereferences instead
......@@ -535,14 +535,14 @@ Updates between 1.2.0 and 1.3.0:
Unless the new --ignore=wrongversion is specified, a dsc must
have the same version, and a .deb must have this source version
unless --ignore=wrongsourceversion is given. A .deb must also
contain a package listed in the Binary: header unless
--ignore=surprisingbinary is given. (A .dsc with an other name
or a .deb with an other Source than the Source-header if the
contain a package listed in the Binary: header unless
--ignore=surprisingbinary is given. (A .dsc with an different name
or a .deb with an different Source than the Source-header if the
.changes file is still not ignoreable due to file naming issues)
- FilterList in update and pull rules now has a space separated list
of filenames instead of only a single filename.
- new Uploaders field in conf/distributions:
allows to specify what a .changes file has to be signed with to be allowed in
specifies what a .changes file has to be signed with to be allowed in
- new helper program "changestool" to preprocess .changes files.
Updates between 1.1.0 and 1.2.0:
......
......@@ -360,7 +360,7 @@ inline static retvalue aptmethod_startup(struct aptmethod *method) {
exit(255);
/* not really useful here, unless someone write reprepro
* specific modules (which I hope noone will) */
* specific modules (which I hope no one will) */
sethookenvironment(NULL, NULL, NULL, NULL);
/* actually call the method without any arguments: */
(void)execl(methodname, methodname, ENDOFARGUMENTS);
......
......@@ -13,7 +13,7 @@ retvalue ar_nextmember(struct ar_archive *, /*@out@*/char ** /*filename*/);
void ar_archivemember_setcompression(struct ar_archive *, enum compression);
/* the following can be used for libarchive to read an file in the ar
* after ar_nextmember returned sucessfully.
* after ar_nextmember returned successfully.
* All references get invalid after the ar_nextmember is called again. */
int ar_archivemember_close(struct archive *, void *);
int ar_archivemember_open(struct archive *, void *);
......
......@@ -343,7 +343,7 @@ retvalue binaries_retrack(const char *packagename, const char *chunk, trackingdb
enum filetype filetype;
struct trackedpackage *pkg;
//TODO: elliminate duplicate code!
//TODO: eliminate duplicate code!
assert(packagename!=NULL);
if (interrupted())
......@@ -426,7 +426,7 @@ retvalue binaries_getsourceandversion(const char *chunk, const char *packagename
retvalue r;
char *sourcename, *sourceversion;
//TODO: elliminate duplicate code!
//TODO: eliminate duplicate code!
assert(packagename!=NULL);
/* is there a sourcename */
......
......@@ -1148,7 +1148,7 @@ static retvalue dsc_prepare(struct changes *changes, struct fileentry *dsc, str
if (RET_WAS_ERROR(r))
return r;
/* noone else might have looked yet, if we have them: */
/* no one else might have looked yet, if we have them: */
assert (dsc->pkg.dsc.files.names.count == dsc->needed_filekeys.count);
for (i = 1 ; i < dsc->pkg.dsc.files.names.count ; i ++) {
......
......@@ -47,9 +47,9 @@
Things to do with .deb's checkin by hand: (by comparison with apt-ftparchive)
- extract the control file (that's the hard part -> extractcontrol.c )
- check for Package, Version, Architecture, Maintainer, Description
- apply overwrite if neccesary (section, priority and perhaps maintainer).
- apply overwrite if necessary (section, priority and perhaps maintainer).
- add Size, MD5sum, Filename, Priority, Section
- remove Status (warning if existant?)
- remove Status (warning if existent?)
- check for Optional-field and reject then..
*/
......
......@@ -50,7 +50,7 @@
things to do with .dsc's checkin by hand: (by comparison with apt-ftparchive)
* Get all from .dsc (search the chunk with
the Source:-field. end the chunk artifical
the Source:-field. end the chunk artificial
before the pgp-end-block.(in case someone
missed the newline there))
......@@ -59,7 +59,7 @@ things to do with .dsc's checkin by hand: (by comparison with apt-ftparchive)
at binary, architecture and build*, as
described in policy 5.4
* Get overwrite information, ecspecially
* Get overwrite information, especially
the priority(if there is a binaries field,
check the one with the highest) and the section
(...what else...?)
......
......@@ -181,7 +181,7 @@ static const char *formaterror(const char *format, ...) {
return data;
}
/* check if this is something that can be used as directory *and* identifer safely */
/* check if this is something that can be used as directory *and* identifier safely */
const char *checkfordirectoryandidentifier(const char *string) {
const char *s;
......
......@@ -755,7 +755,7 @@ retvalue checksumsarray_parse(struct checksumsarray *out, const struct strlist l
return RET_OK;
}
#if 0
// TODO: reenable this once apt-utils is fixed for a long enough time...
// TODO: re-enable this once apt-utils is fixed for a long enough time...
for (i = 0 ; i < filenames.count ; i++) {
for (cs = cs_md5sum ; cs < cs_hashCOUNT ; cs++) {
if (!foundhashtype[cs])
......
......@@ -745,7 +745,7 @@ const char *chunk_over(const char *e) {
return e;
}
/* this is a bit wastefull, as with normally perfect formated input, it just
/* this is a bit wastefull, as with normally perfect formatted input, it just
* writes everything to itself in a inefficent way. But when there are \r
* in it or spaces before it or stuff like that, it will be in perfect
* form afterwards. */
......
......@@ -412,7 +412,7 @@ static inline bool targetisdefined(const char *identifier, struct distribution *
return false;
}
static retvalue warnidentifers(const struct strlist *identifiers, struct distribution *distributions, bool readonly) {
static retvalue warnidentifiers(const struct strlist *identifiers, struct distribution *distributions, bool readonly) {
struct distribution *d;
struct target *t;
const char *identifier;
......@@ -902,7 +902,7 @@ retvalue database_create(struct distribution *alldistributions, bool fast, bool
}
if (r == RET_NOTHING)
strlist_init(&identifiers);
r = warnidentifers(&identifiers,
r = warnidentifiers(&identifiers,
alldistributions, readonly);
if (RET_WAS_ERROR(r)) {
strlist_done(&identifiers);
......
This is a list of "frequently" asked questions.
1.1) What can I do when reprepro complains about a missing .orig.tar.gz?
1.2) Why does it refuse a file when one in an other suite has the same name?
1.2) Why does it refuse a file when one in another suite has the same name?
1.4) The key to sign my Release files needs a passphrase, what to do?
1.5) How do I change how files are downloaded.
1.6) How to omit packages missing files when updating.
......@@ -32,7 +32,7 @@ You are facing the choice:
it calls dpkg-genchanges with -sa which then always lists .orig.tar.gz
and not only if it ends in -0 or -1.
1.2) Why does it refuse a file when one in an other suite has the same name?
1.2) Why does it refuse a file when one in another suite has the same name?
----------------------------------------------------------------------------
Reprepro uses Debian's way to organize the pool hierarchy, which means
that the directory and name a file is saved under is only determined by
......
#!/bin/sh
# This is an example script that can be hooked into reprepro
# to either generate a hierachy like packages.debian.org/changelogs/
# to either generate a hierarchy like packages.debian.org/changelogs/
# or to generate changelog files in the "third party sites"
# location apt-get changelogs looks if it is not found in
# Apt::Changelogs::Server.
......@@ -33,7 +33,7 @@ else
exit 1
fi
# CHANGELOGDIR set means generate full hierachy
# CHANGELOGDIR set means generate full hierarchy
# (clients need to set Apt::Changelogs::Server to use that)
CHANGELOGDIR=changelogs
......
......@@ -130,7 +130,7 @@ and in the directories specified by the \fB\-\-searchpath\fP.
Add the \fB.dsc\fP files specified by their filenames to
the \fB.changes\fP file.
Filenames without a slash will be searched
in the the current directory,
in the current directory,
in the directory the changes file resides in
and in the directories specified by the \fB\-\-searchpath\fP.
.TP
......
......@@ -189,7 +189,7 @@ VerifyRelease: A70DAF536070D3A1|B5D0C804ADB11277
reprepro -b $YOURBASEDIR update etch
</pre>
</li>
<li>Take a look at at the generated <tt>pool</tt> and <tt>dists</tt>
<li>Take a look at the generated <tt>pool</tt> and <tt>dists</tt>
directories. They contain everything needed to apt-get from.
Tell apt to include it by adding the following to your <tt>sources.list</tt>:
<pre class="shell">
......@@ -374,7 +374,7 @@ reprepro):
<dl class="dir">
<dt class="dir">pool</dt><dd>
The directory all this resides is is normally called <tt class="dir">pool</tt>.
The directory all this resides in is normally called <tt class="dir">pool</tt>.
That's nowhere hard coded in apt but that only looks at the relative
directory names in the index files. But there is also no reason to name
it differently.
......@@ -495,13 +495,13 @@ option, the generated index files may be permanently out of date.
</dd><dt>silent-never</dt><dd>Like never, but be more silent about it.
</dd><dt>changed</dt><dd>This is the default behaviour since 3.0.1.
Only export distributions where something changed
(and no error occoured that makes an inconsistent state likely).
(and no error occurred that makes an inconsistent state likely).
And in those distributions only (re-)generate files which content should have been changed
by the current action or which are missing.
</dd><dt>lookedat</dt><dd>New name for <tt>normal</tt> since 3.0.1.
</dd><dt>normal</dt><dd>This was the default behaviour until 3.0.0 (changed in 3.0.1).
In this mode all distributions are processed that were looked at without error
(where error means only errors hapening while the package was open so have a chance
(where error means only errors happening while the package was open so have a chance
to cause strange contents).
This ensures that even after a operation that had nothing to do the looked at
distribution has all the files exported needed to access it. (But still only files
......@@ -561,7 +561,7 @@ supports, which might include most that gpg supports to select a key).
The best way to deal with keys needing passphrases is to use
<a href="http://packages.debian.org/gnupg-agent">gpg-agent</a>.
The only way to specify which keyring to use is to set the
<tt class="env">GNUPGHOME</tt> enviroment variable, which will effect all
<tt class="env">GNUPGHOME</tt> environment variable, which will effect all
distributions.
<h4><a name="contents">Contents files</a></h4>
Reprepro can generate files called
......@@ -628,7 +628,7 @@ for just some small changes.
To use it, copy <tt class="file">pdiff.example</tt> from the examples directory
into your <tt class="dir">conf</tt> directory.
(or any other directory, then you will need to give an absolute path later).
Unpack, if needed. Rename it to pdiff.py and make it executeable.
Unpack, if needed. Rename it to pdiff.py and make it executable.
Make sure you have
<a href="http://packages.debian.org/python3-apt">python3-apt</a>,
<a href="http://packages.debian.org/diff">diff</a> and
......@@ -651,7 +651,7 @@ with no <tt>libbz2-dev</tt> installed.
To use it, copy <tt class="file">bzip.example</tt> from the examples directory
into your <tt class="dir">conf</tt> directory.
(or any other directory, then you will need to give an absolute path later).
Unpack, if needed. Rename it to bzip2.sh and make it executeable.
Unpack, if needed. Rename it to bzip2.sh and make it executable.
Then add something like the following to the headers of the distributions
that should use this in <tt class="file">conf/distributions</tt>:
<pre class="config">
......@@ -673,7 +673,7 @@ These are for including packages at the command line.
Many options are available to control what actually happens.
You can easily force components, section and priority and/or choose to
include only some files or only in specific architectures.
(Can be quite usefull for architecture all packages depending on some
(Can be quite useful for architecture all packages depending on some
packages you will some time before building for some of your architectures).
Files can be moved instead of copied and most sanity checks overwritten.
They are also optimized towards being fast and simply try things instead of
......@@ -695,7 +695,7 @@ There are three commands to directly include packages into your repository:
<tt class="command">includedeb</tt>, <tt class="command">includedsc</tt>
and <tt class="command">includechanges</tt>.
Each needs to codename of the distribution you want to put your package into
as first argument and a file of the appropiate type
as first argument and a file of the appropriate type
(<tt class="suffix">.deb</tt>, <tt class="suffix">.dsc</tt> or
<tt class="suffix">.changes</tt>, respectively) as second argument.
<br>
......@@ -814,7 +814,7 @@ A list of options to allow things otherwise causing errors.
<br>This field os optional.</dd>
<dt>Cleanup</dt><dd>
Determines when and what files to delete from the incoming queue.
By default only sucessfully processed <tt class="suffix">.changes</tt> files
By default only successfully processed <tt class="suffix">.changes</tt> files
and the files references by those are deleted.
For a list of possible options take a look into the man page.
<br>This field os optional.</dd>
......@@ -839,7 +839,7 @@ and <tt class="field">Default</tt> fields.
<h4>Getting <tt class="command">processincoming</tt> called.</h4></a>
While you can just call <tt class="command">reprepro processincoming</tt> manually,
having an incoming queue needing manual intervention takes all the fun out of
having an incoming queue, so usually so automatic way is choosen:
having an incoming queue, so usually so automatic way is chosen:
<ul>
<li>Dupload and dput have ways to call an hook after an package was uploaded.
This can be an ssh to the host calling reprepro.
......@@ -1020,7 +1020,7 @@ command:
<pre class="shell">
reprepro copy bla development name1 name2 name3
</pre>
If you do not want to copy all pakages of a given name, but only some
If you do not want to copy all packages of a given name, but only some
of them, you can use <tt>-A</tt>, <tt>-T</tt> and <tt>-C</tt>:
<pre class="shell">
reprepro -T deb -A i386 copy bla development name1
......@@ -1036,7 +1036,7 @@ TO BE DOCUMENTED
TO BE DOCUMENTED
<h2><a name="hooks">Extending reprepro / Hooks and more</a></h2>
When reprepro misses some functionality,
it often can be be added by some kind of hook.
it often can be added by some kind of hook.
<br>
Currently you can execute your own scripts at the following occasions:
<ul>
......@@ -1058,7 +1058,7 @@ but despite the name, it is not restricted to logging.
<h4>Automatically extracting changelog and copyright information</h4>
reprepro ships with an example script to extract <tt class="file">debian/changelog</tt>
and <tt class="file">debian/copyright</tt>
files from source packages into a hierachy loosely resembling the way changelogs
files from source packages into a hierarchy loosely resembling the way changelogs
are made available at
<a href="http://packages.debian.org/changelogs/">http://packages.debian.org/changelogs/</a>.
<br>
......@@ -1108,7 +1108,7 @@ of the distribution.
The second kind is marked with <tt class="option">--changes</tt> and is
called when a <tt class="suffix">.changes</tt>-file was added with
<tt class="command">include</tt> or <tt class="command">processincoming</tt>.
Both are called asynchonous in the background <emph>after</emph> everything was done,
Both are called asynchronous in the background <emph>after</emph> everything was done,
but before no longer referenced files are deleted (so the files of the
replaced or deleted package are still around).
<h5>Calling conventions for package addition/removal scripts</h5>
......@@ -1221,7 +1221,7 @@ any changes done to the out dir and calls the hook script given as argument with
file as argument.
The <tt class="suffix">.outlog</tt> file consists of lines each starting with a keyword
and then some arguments seperated by tab characters.
and then some arguments separated by tab characters.
The possible keywords are:
<ul>
......@@ -1278,7 +1278,7 @@ reprepro -b $YOURBASEDIR dumpunreferenced
</pre>
This lists all files reprepro knows about that are not marked as needed by anything.
Unless you called reprepro with the <tt class="option">--keepunreferenced</tt>
option, those should never occour. Though if reprepro is confused or interupted it
option, those should never occur. Though if reprepro is confused or interrupted it
may sometimes prefer keeping files around instead of deleting them.
<pre class="command">
reprepro -b $YOURBASEDIR deleteunreferenced
......
......@@ -22,7 +22,7 @@
# report some errors properly
# - uncompress this file if it is compressed
# - copy this file to your conf/ directory as "pdiff"
# - make it executeable
# - make it executable
# - add something like the following to the every distribution
# in conf/distributions you want to have diffs for:
#
......@@ -246,7 +246,7 @@ def main():
f = open(outdir + "/Index.new", "w")
upd.dump(f)
f.close()
# Specifing the index should be enough, it contains checksums for the diffs
# Specifying the index should be enough, it contains checksums for the diffs
os.write(3,(oldrelfile + ".diff/Index.new\n").encode("utf-8"))
################################################################################
......
......@@ -576,7 +576,7 @@ _reprepro()
return 0
;;
deleteifunreferenced)
# less usefull than the output of dumpunreferenced,
# less useful than the output of dumpunreferenced,
# but this way it should be massively faster:
parse_config_for_distdir
COMPREPLY=( $(cd "$outdir" && compgen -o filenames -f -- $cur) )
......
......@@ -230,7 +230,7 @@ commands=(
list:"list packages"
ls:"list versions of package"
lsbycomponent:"list versions of package (grouped by component)"
predelete:"delete what would be removed or superseeded by an update"
predelete:"delete what would be removed or superseded by an update"
processincoming:"process files from an incoming directory"
pull:"update from another local distribtuion"
removealltracks:"remove tracking information"
......@@ -277,7 +277,7 @@ hiddencommands=(
_listdbidentifiers:"list parts of the repository in the database"
_listmd5sums:"print a list of filekeys and their md5 hashes"
_removereference:"manuall remove a reference"
_removereferences:"remove all references by an identifer"
_removereferences:"remove all references by an identifier"
)
_arguments \
......@@ -314,7 +314,7 @@ _arguments \
brokenold\:"ignore broken packages in database"\
brokenversioncmp\:"ignore versions not parseable"\
extension\:"ignore unexpected suffixes of files"\
unusedarch\:"allow changes files to list achitectures not used"\
unusedarch\:"allow changes files to list architectures not used"\
unusedoption\:"ignore command line options not used by an action"\
undefinedtarget\:"allow unspecified package databases"\
undefinedtracking\:"allow unspecified tracking databases"\
......
......@@ -37,7 +37,7 @@ class EnumInternException(Exception):
class _EnumType(type):
"""
Metaclass for Enum. Allows to set values as parameters.
Metaclass for Enum. Allows one to set values as parameters.
"""
def __new__(cls, name, bases, namespace, **values):
return type.__new__(cls, name, bases, namespace)
......@@ -99,7 +99,7 @@ class Enum(metaclass=_EnumType):
class _BitmaskType(type):
"""
Metaclass for Bitmask types. Allows to set values as parameters.
Metaclass for Bitmask types. Allows one to set values as parameters.
"""
@classmethod
def __prepare__(cls, name, bases, **values):
......@@ -624,7 +624,7 @@ class Connection:
commandline = [sshcommand]
if ssh_options:
commandline.extend(ssh_options)
# those defaults are after the user-supplied ones so they can be overriden.
# those defaults are after the user-supplied ones so they can be overridden.
# (earlier ones win with ssh).
commandline.extend(["-oProtocol 2", # "-oLogLevel DEBUG",
"-oForwardX11 no", "-oForwardAgent no",
......
......@@ -350,7 +350,7 @@ static retvalue callexporthook(/*@null@*/const char *hook, const char *relfilena
if (io[1] != 3)
(void)close(io[1]);
closefrom(4);
/* backward compatibilty */
/* backward compatibility */
reltmpfilename = calc_addsuffix(relfilename, "new");
if (reltmpfilename == NULL) {
exit(255);
......
......@@ -71,7 +71,7 @@ enum cleanupflags {
/* delete everything referenced by a .changes on errors
* after accepting that .changes file*/
cuf_on_error,
/* delete unused files after sucessfully
/* delete unused files after successfully
* processing the used ones */
cuf_unused_files,
/* same but restricted to .buildinfo files */
......@@ -2265,9 +2265,9 @@ static retvalue candidate_add(struct incoming *i, struct candidate *c) {
return r;
}
// TODO: once uploaderlist allows to look for package names or existing
// override entries or such things, check package names here enable
// checking for content name with outer name
// TODO: once uploaderlist allows one to look for package names or
// existing override entries or such things, check package names here
// enable checking for content name with outer name
/* when we get here, the package is allowed in, now we have to
* read the parts and check all stuff we only know now */
......
......@@ -2487,8 +2487,8 @@ ACTION_F(y, n, y, y, reoverride) {
continue;
r = target_reoverride(t, d);
RET_UPDATE(result, r);
// TODO: how to seperate this in those affecting d
// and those that do not?
// TODO: how to separate this in those
// affecting d and those that do not?
RET_UPDATE(d->status, r);
}
distribution_unloadoverrides(d);
......
......@@ -341,7 +341,7 @@ const char *override_get(const struct overridedata *override, const char *field)
return NULL;
for (i = 0 ; i+1 < override->fields.count ; i+=2) {
// TODO curently case-sensitiv. warn if otherwise?
// TODO currently case-sensitiv. warn if otherwise?
if (strcmp(override->fields.values[i], field) == 0)
return override->fields.values[i+1];
}
......
......@@ -193,7 +193,7 @@ retvalue pool_markadded(const char *filekey) {
return remember_filekey(filekey, pl_ADDED, ~pl_DELETED);
};
/* so much code, just for the case the morguedir is on an other partition than
/* so much code, just for the case the morguedir is on another partition than
* the pool dir... */
static inline retvalue copyfile(const char *source, const char *destination, int outfd, off_t length) {
......
......@@ -88,7 +88,7 @@ retvalue references_decrement(const char *needed, const char *neededby) {
return r;
}
/* Add an reference by <identifer> for the given <files>,
/* Add an reference by <identifier> for the given <files>,
* excluding <exclude>, if it is nonNULL. */
retvalue references_insert(const char *identifier,
const struct strlist *files, const struct strlist *exclude) {
......@@ -123,7 +123,7 @@ retvalue references_add(const char *identifier, const struct strlist *files) {
return RET_OK;
}
/* Remove reference by <identifer> for the given <oldfiles>,
/* Remove reference by <identifier> for the given <oldfiles>,
* excluding <exclude>, if it is nonNULL. */
retvalue references_delete(const char *identifier, struct strlist *files, const struct strlist *exclude) {
retvalue result, r;
......
......@@ -20,15 +20,15 @@ struct references;
/* remove all references from a given identifier */
retvalue references_remove(const char *neededby);
/* Add an reference by <identifer> for the given <files>,
/* Add an reference by <identifier> for the given <files>,
* excluding <exclude>, if it is nonNULL. */
retvalue references_insert(const char *, const struct strlist *, const struct strlist * /*exclude*/);
/* Add an reference by <identifer> for the given <files>,
/* Add an reference by <identifier> for the given <files>,
* do not error out if reference already exists */
retvalue references_add(const char *, const struct strlist *);
/* Remove reference by <identifer> for the given <oldfiles>,
/* Remove reference by <identifier> for the given <oldfiles>,
* excluding <exclude>, if it is nonNULL. */
retvalue references_delete(const char *, struct strlist *, /*@null@*/const struct strlist * /*exclude*/);
......
......@@ -999,7 +999,7 @@ static retvalue writegz(struct filetorelease *f) {
f->gz_waiting_bytes = 0;
}
/* as we start with some data to process, Z_BUF_ERROR
* should only happend when no output is possible, as that
* should only happen when no output is possible, as that
* gets possible again it should finally produce more output
* and return Z_OK and always terminate. Hopefully... */
} while (zret == Z_BUF_ERROR
......
......@@ -1848,7 +1848,7 @@ static retvalue queue_next_diff(struct remote_index *ri) {
&improves))
continue;
/* p->frompackages should only have sha1 and oldchecksums
* should definitly list a sha1 hash */
* should definitely list a sha1 hash */
assert (!improves);
p->done = true;
......
......@@ -287,7 +287,7 @@ void free_known_keys(void) {
struct signature_requirement {
/* next condition */
struct signature_requirement *next;
/* the original desription for error messages */
/* the original description for error messages */
char *condition;
/* an array of or-connected conditions */
size_t num_keys;
......
......@@ -370,7 +370,7 @@ retvalue sources_retrack(const char *sourcename, const char *chunk, trackingdb t
struct strlist filekeys;
int i;
//TODO: elliminate duplicate code!
//TODO: eliminate duplicate code!
assert(sourcename!=NULL);
if (interrupted())
......@@ -425,7 +425,7 @@ retvalue sources_getsourceandversion(const char *chunk, const char *packagename,
char *sourceversion;
char *sourcename;
//TODO: elliminate duplicate code!
//TODO: eliminate duplicate code!
assert(packagename!=NULL);
r = chunk_getvalue(chunk, "Version", &sourceversion);
......
......@@ -688,7 +688,7 @@ static retvalue read_dscfile(const char *fullfilename, struct dscfile **dsc) {
return r;
}
/* unusally not here, but hidden in the contents */
/* usually not here, but hidden in the contents */
r = chunk_getvalue(n->controlchunk, "Section", &n->section);
if (RET_WAS_ERROR(r)) {
dscfile_free(n);
......
......@@ -304,7 +304,7 @@ static void search_binary(/*@null@*/const char *setting, const char *default_pro
return;
/* look for the file, look in $PATH if not qualified,
* only check existence, if someone it putting files not executable
* by us there it is their fault (as being executeable by us is hard
* by us there it is their fault (as being executable by us is hard
* to check) */
if (strchr(setting, '/') != NULL) {
if (!isregularfile(setting))
......
......@@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301 USA
*/
/* This module handles the updating of distribtions from remote repositories.
/* This module handles the updating of distributions from remote repositories.
* It's using apt's methods (the files in /usr/lib/apt/methods) for the
* actuall getting of needed lists and package files.
*
......@@ -2057,7 +2057,7 @@ static retvalue updates_preparelists(struct aptmethodrun *run, struct update_dis
/* we need anything that is needed in a target
* where something is new (as new might mean
* a package is left hiding leftmore packages,
* and everthing in rightmore packages is needed
* and everything in rightmore packages is needed
* to see what in the new takes effect) */
for (ut = d->targets; ut != NULL ; ut = ut->next) {
if (ut->nothingnew)
......
......@@ -251,7 +251,7 @@ static retvalue upgradelist_trypackage(struct upgradelist *upgrade, void *privda
current = NULL;
break;
}
// I only hope noone creates indices anti-sorted:
// I only hope no one creates indices anti-sorted:
precmp = strcmp(package->name, insertafter->name);
if (precmp == 0) {
current = insertafter;
......
......@@ -437,7 +437,7 @@ enum upload_condition_type uploaders_nextcondition(struct upload_conditions *c)
return uc_ACCEPTED;
c->current = c->current->next_if_true;
} else {
/* empty set fullfills all conditions,
/* empty set fulfills all conditions,
but not an exists condition */
switch (c->current->needs) {
case needs_any:
......@@ -922,7 +922,7 @@ static retvalue parse_condition(const struct filebeingparsed *fbp, int column, c
/* everything in current scope that made it fail
* now makes it check this: (currently that will
* only be true at most for c == last, but with
* parantheses this all will be needed) */
* parentheses this all will be needed) */
for (c = or_scope ; c != NULL ; c = c->next) {
if (c->next_if_true == fallback)
c->next_if_true = n;
......
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