marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #49 from jsoref/spelling 

spelling fixes
tingping/wmclass
Alexander Larsson 2016-05-27 09:02:14 +02:00
parent 6b65972434 c33b5b52d7
commit f9cbcc3996
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -104,7 +104,7 @@ Major changes in 0.4.13
* Add sources to Debug extensions created by xdg-app-builder
* Allow specifying subdirs of xdg-* dirs, for instance:
--filesystem=xdg-download/some-dir
* Add support for --filesytem=xdg-run/subdir which means
* Add support for --filesystem=xdg-run/subdir which means
XDG_RUNTIME_DIR dir, rather than xdg-user-dirs.
* Add --generate-static-deltas option to build-update-repo.

10
builder/builder-utils.c
View File

@ -385,7 +385,7 @@ builder_migrate_locale_dirs (GFile *root_dir,
#define DEBUG_TYPES 11
#define DEBUG_MACRO 12
#define DEBUG_GDB_SCRIPT 13
#define NUM_DEBUG_SECTIIONS 14
#define NUM_DEBUG_SECTIONS 14
static const char * debug_section_names[] = {
".debug_info",
@ -420,7 +420,7 @@ typedef struct
Elf_Scn **scns;
const char *filename;
int lastscn;
debug_section_t debug_sections[NUM_DEBUG_SECTIIONS];
debug_section_t debug_sections[NUM_DEBUG_SECTIONS];
GElf_Shdr *shdr;
} DebuginfoData;
@ -1282,7 +1282,7 @@ builder_get_debuginfo_file_references (const char *filename, GError **error)
if (g_str_has_prefix (name, ".debug_"))
{
for (j = 0; j < NUM_DEBUG_SECTIIONS; ++j)
for (j = 0; j < NUM_DEBUG_SECTIONS; ++j)
{
if (strcmp (name, debug_section_names[j]) == 0)
{
@ -1305,14 +1305,14 @@ builder_get_debuginfo_file_references (const char *filename, GError **error)
}
}
if (j == NUM_DEBUG_SECTIIONS)
if (j == NUM_DEBUG_SECTIONS)
g_warning ("%s: Unknown debugging section %s", filename, name);
}
else if (ehdr.e_type == ET_REL &&
((shdr[i].sh_type == SHT_REL && g_str_has_prefix (name, ".rel.debug_")) ||
(shdr[i].sh_type == SHT_RELA && g_str_has_prefix (name, ".rela.debug_"))))
{
for (j = 0; j < NUM_DEBUG_SECTIIONS; ++j)
for (j = 0; j < NUM_DEBUG_SECTIONS; ++j)
if (strcmp (name + sizeof (".rel") - 1
+ (shdr[i].sh_type == SHT_RELA),
debug_section_names[j]) == 0)

8
buildutil/glib-tap.mk
View File

@ -61,10 +61,10 @@ EXTRA_DIST += buildutil/tap-driver.sh buildutil/tap-test
# dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
# dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
#
# Note that no file is automatically disted unless it appears in one of the dist_ variables. This follows the
# standard automake convention of not disting programs scripts or data by default.
# Note that no file is automatically dist-ed unless it appears in one of the dist_ variables. This follows the
# standard automake convention of not dist-ing programs scripts or data by default.
#
# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their dist-ed
# variants) will be run as part of the in-tree 'make check'. These are all assumed to be runnable under
# gtester. That's a bit strange for scripts, but it's possible.
@ -72,7 +72,7 @@ TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninsta
$(dist_test_scripts) $(dist_uninstalled_test_scripts)
# Note: build even the installed-only targets during 'make check' to ensure that they still work.
# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
# We need to do a bit of trickery here and manage dist-ing via EXTRA_DIST instead of using dist_ prefixes to
# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
all_test_programs = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \

4
buildutil/tap-driver.sh
View File

@ -370,7 +370,7 @@ function setup_result_obj(line)
sub("^(not )?ok[ \t]*", "", line)
# If the result has an explicit number, get it and strip it; otherwise,
# automatically assing the next progresive number to it.
# automatically assing the next progressive number to it.
if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
{
match(line, "^[0-9]+")
@ -593,7 +593,7 @@ while (1)
bailout_message = bailout_message " " $0
testsuite_error(bailout_message)
}
# Maybe we have too look for dianogtic comments too.
# Maybe we have too look for diagnostic comments too.
else if (comments != 0)
{
comment = extract_tap_comment($0);

2
buildutil/tap-test
View File

@ -1,7 +1,7 @@
#! /bin/bash
#
# Run a test in tap mode, ensuring we have a temporary directory. We
# always use /var/tmp becuase we might want to use user xattrs, which
# always use /var/tmp because we might want to use user xattrs, which
# aren't available on tmpfs.
#
# The test binary is passed as $1

2
common/flatpak-dir.c
View File

@ -592,7 +592,7 @@ flatpak_dir_get_repo (FlatpakDir *self)
/* This is an exclusive per flatpak installation file lock that is taken
* whenever any config in the directory outside the repo is to be changed. For
* instance deployements, overrides or active commit changes.
* instance deployments, overrides or active commit changes.
*
* For concurrency protection of the actual repository we rely on ostree
* to do the right thing.

2
common/flatpak-run.c
View File

@ -2691,7 +2691,7 @@ setup_seccomp (GPtrArray *argv_array,
native one. This is not ideal, because we'd like to only
allow the target arch, but we can't really disallow the
native arch at this point, because then bubblewrap
couldn't continue runnning. */
couldn't continue running. */
r = seccomp_arch_add (seccomp, arch_id);
if (r < 0 && r != -EEXIST)
return flatpak_fail (error, "Failed to add architecture to seccomp filter");

4
common/flatpak-utils.c
View File

@ -236,7 +236,7 @@ flatpak_get_kernel_arch (void)
* family can run all opcodes, for instance for modern 32bit intel we
* report "i386", even though they support instructions that the
* original i386 cpu cannot run. Still, such an executable would
* at least try to execute a 386, wheras an arm binary would not.
* at least try to execute a 386, whereas an arm binary would not.
*/
const char *
flatpak_get_arch (void)
@ -2875,7 +2875,7 @@ flatpak_pull_from_bundle (OstreeRepo *repo,
return FALSE;
/* We ensure that the actual installed metadata matches the one in the
header, because you may have made decisions on wheter to install it or not
header, because you may have made decisions on whether to install it or not
based on that data. */
metadata_file = g_file_resolve_relative_path (root, "metadata");
in = (GInputStream *) g_file_read (metadata_file, cancellable, NULL);

2
dbus-proxy/dbus-proxy.c
View File

@ -197,7 +197,7 @@ main (int argc, const char *argv[])
if (proxies == NULL)
{
g_printerr ("No proxies specied\n");
g_printerr ("No proxies specified\n");
return 1;
}

6
dbus-proxy/flatpak-proxy.c
View File

@ -60,7 +60,7 @@
* in a proxy. But this is rarely a problem in practice, as clients
* rarely release names and stay on the bus.
*
* Here is a desciption of the policy levels:
* Here is a description of the policy levels:
* (all policy levels also imply the ones before it)
*
* SEE:
@ -1717,7 +1717,7 @@ queue_initial_name_ops (FlatpakProxyClient *client)
if (client->proxy->log_messages)
g_print ("C%d: -> org.freedesktop.DBus fake ListNames\n", client->last_serial);
/* Stop reading from the client, to avoid incomming messages fighting with the ListNames roundtrip.
/* Stop reading from the client, to avoid incoming messages fighting with the ListNames roundtrip.
We will start it again once we have handled the ListNames reply */
stop_reading (&client->client_side);
}
@ -1929,7 +1929,7 @@ got_buffer_from_bus (FlatpakProxyClient *client, ProxySide *side, Buffer *buffer
FlatpakPolicy policy;
ExpectedReplyType expected_reply;
/* Filter and rewrite incomming messages as needed */
/* Filter and rewrite incoming messages as needed */
if (!parse_header (buffer, &header, 0, client->serial_offset, client->hello_serial))
{

8
doc/flatpak-builder.xml
View File

@ -355,7 +355,7 @@
<title>Sources</title>
<para>
These contain a pointer to the source that will be extracted into the source directory before
the build starts. They can be of several types, distiguished by the type property.
the build starts. They can be of several types, distinguished by the type property.
</para>
<refsect3>
<title>Archive sources (tar, zip)</title>
@ -395,11 +395,11 @@
</varlistentry>
<varlistentry>
<term><option>url</option> (string)</term>
<listitem><para>URL of the git repostiory</para></listitem>
<listitem><para>URL of the git repository</para></listitem>
</varlistentry>
<varlistentry>
<term><option>branch</option> (string)</term>
<listitem><para>The branch/tag/commit to use from the git repostiory</para></listitem>
<listitem><para>The branch/tag/commit to use from the git repository</para></listitem>
</varlistentry>
<varlistentry>
<term><option>dest</option> (string)</term>
@ -416,7 +416,7 @@
</varlistentry>
<varlistentry>
<term><option>url</option> (string)</term>
<listitem><para>URL of the bzr repostiory</para></listitem>
<listitem><para>URL of the bzr repository</para></listitem>
</varlistentry>
<varlistentry>
<term><option>revision</option> (string)</term>

2
doc/flatpak-install.xml
View File

@ -153,7 +153,7 @@
<term><option>--no-pull</option></term>
<listitem><para>
Don't download the latest version, deploy it whatever is locally availiable.
Don't download the latest version, deploy it whatever is locally available.
</para></listitem>
</varlistentry>

2
doc/flatpak-update.xml
View File

@ -141,7 +141,7 @@
<term><option>--no-pull</option></term>
<listitem><para>
Don't download the latest version, deploy it whatever is locally availiable.
Don't download the latest version, deploy it whatever is locally available.
</para></listitem>
</varlistentry>

2
doc/flatpak.xml
View File

@ -177,7 +177,7 @@
</varlistentry>
</variablelist>
<para>Commands for managing remote rempositories:</para>
<para>Commands for managing remote repositories:</para>
<variablelist>
<varlistentry>

8
lib/flatpak-installation.c
View File

@ -874,7 +874,7 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
guint fetched;
guint metadata_fetched;
guint requested;
guint64 ellapsed_time;
guint64 elapsed_time;
guint new_progress = 0;
gboolean estimating = FALSE;
@ -892,7 +892,7 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
fetched = ostree_async_progress_get_uint (progress, "fetched");
metadata_fetched = ostree_async_progress_get_uint (progress, "metadata-fetched");
requested = ostree_async_progress_get_uint (progress, "requested");
ellapsed_time = (g_get_monotonic_time () - ostree_async_progress_get_uint64 (progress, "start-time")) / G_USEC_PER_SEC;
elapsed_time = (g_get_monotonic_time () - ostree_async_progress_get_uint64 (progress, "start-time")) / G_USEC_PER_SEC;
if (status)
{
@ -900,7 +900,7 @@ progress_cb (OstreeAsyncProgress *progress, gpointer user_data)
}
else if (outstanding_fetches)
{
guint64 bytes_sec = bytes_transferred / ellapsed_time;
guint64 bytes_sec = bytes_transferred / elapsed_time;
g_autofree char *formatted_bytes_transferred =
g_format_size_full (bytes_transferred, 0);
g_autofree char *formatted_bytes_sec = NULL;
@ -1299,7 +1299,7 @@ flatpak_installation_uninstall (FlatpakInstallation *self,
* to pull the ref from a remote repository, and about the amount of
* local disk space that is required to check out this commit.
*
* Note that if there are locally available data that are in the ref, which is commong
* Note that if there are locally available data that are in the ref, which is common
* for instance if you're doing an update then the real download size may be smaller
* than what is returned here.
*