diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-26 17:35:11 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-11-26 17:35:11 +0000 |
commit | 37b60820b7daec4ac2dbc0b6ecc5ff02f931d1d2 (patch) | |
tree | 38c2d0db0f34bc71387619d93b2491e5bd3aa1d6 /calculate.txt | |
parent | 2020-11-26T17:00:01Z (diff) | |
download | repos-37b60820b7daec4ac2dbc0b6ecc5ff02f931d1d2.tar.gz repos-37b60820b7daec4ac2dbc0b6ecc5ff02f931d1d2.tar.bz2 repos-37b60820b7daec4ac2dbc0b6ecc5ff02f931d1d2.zip |
2020-11-26T17:30:01Z
Diffstat (limited to 'calculate.txt')
-rw-r--r-- | calculate.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/calculate.txt b/calculate.txt index 4cec0f0c1c3e..479428ae3c0f 100644 --- a/calculate.txt +++ b/calculate.txt @@ -7,7 +7,6 @@ 'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}], 'status': 'unofficial'} $ pmaint sync calculate -WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: @@ -21,7 +20,16 @@ preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. -Already up to date. +From git://git.calculate-linux.org/calculate/calculate-overlay + a40701a18..6d1195435 master -> origin/master + a40701a18..6d1195435 master64 -> origin/master64 + * [new tag] 2268 -> 2268 +Updating a40701a18..6d1195435 +Fast-forward + .../3.6/2_ac_install_merge/media-gfx/fontforge/fontforge.desktop | 2 +- + .../media-gfx/fontforge/org.fontforge.FontForge.desktop | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + create mode 100644 profiles/templates/3.6/2_ac_install_merge/media-gfx/fontforge/org.fontforge.FontForge.desktop *** syncing calculate *** synced calculate * Sync succeeded |