From b23bc311d5d54e6289d883975e22d12f406fed00 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 14 Mar 2021 23:35:55 +0000 Subject: 2021-03-14T23:30:01Z --- R_Overlay.html | 2 +- R_Overlay.txt | 2 +- average.html | 44 ++++++++++++++++++++++--------------------- average.txt | 1 + awesome.html | 44 +++++++++++++++++++++---------------------- awesome.txt | 1 - fusion809.html | 58 +++++++++++++++++++++++++++++---------------------------- fusion809.txt | 1 + fuverlay.html | 46 +++++++++++++++++++++++---------------------- fuverlay.txt | 1 + gentoo.html | 48 ++++++++--------------------------------------- gentoo.txt | 18 +----------------- index.html | 2 +- jkolo.html | 48 ++++++++++++++++++++++++----------------------- jkolo.txt | 1 + jm-overlay.html | 44 ++++++++++++++++++++++--------------------- jm-overlay.txt | 1 + librepilot.html | 44 ++++++++++++++++++++++--------------------- librepilot.txt | 1 + swegener.html | 6 +++--- swegener.txt | 6 +++--- zugaina.html | 8 ++++---- zugaina.txt | 8 ++++---- 23 files changed, 201 insertions(+), 234 deletions(-) diff --git a/R_Overlay.html b/R_Overlay.html index 245f12c65b1f..52e5be1a6309 100644 --- a/R_Overlay.html +++ b/R_Overlay.html @@ -50,7 +50,7 @@ 20
Matched data: 0 bytes
 
- 21
File list size: 2.34M
+            21
File list size: 2.22M
 
22
File list generation time: 0.001 seconds
 
diff --git a/R_Overlay.txt b/R_Overlay.txt index 9220f2037be9..84e1f85e62a4 100644 --- a/R_Overlay.txt +++ b/R_Overlay.txt @@ -18,7 +18,7 @@ Total file size: 62.42M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 2.34M +File list size: 2.22M File list generation time: 0.001 seconds File list transfer time: 0.000 seconds Total bytes sent: 17.68K diff --git a/average.html b/average.html index 47c17b5f20c8..78abcc7b7292 100644 --- a/average.html +++ b/average.html @@ -40,47 +40,49 @@
15
$ pmaint sync average
 
- 16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 17
discouraged. You can squelch this message by running one of the following
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 
- 18
commands sometime before your next pull:
+            18
discouraged. You can squelch this message by running one of the following
 
- 19
+            19
commands sometime before your next pull:
 
- 20
  git config pull.rebase false  # merge (the default strategy)
+            20
 
- 21
  git config pull.rebase true   # rebase
+            21
  git config pull.rebase false  # merge (the default strategy)
 
- 22
  git config pull.ff only       # fast-forward only
+            22
  git config pull.rebase true   # rebase
 
- 23
+            23
  git config pull.ff only       # fast-forward only
 
- 24
You can replace "git config" with "git config --global" to set a default
+            24
 
- 25
preference for all repositories. You can also pass --rebase, --no-rebase,
+            25
You can replace "git config" with "git config --global" to set a default
 
- 26
or --ff-only on the command line to override the configured default per
+            26
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 27
invocation.
+            27
or --ff-only on the command line to override the configured default per
 
- 28
+            28
invocation.
 
- 29
Already up to date.
+            29
 
- 30
*** syncing average
+            30
Already up to date.
 
- 31
*** synced average
+            31
*** syncing average
 
- 32
 * Sync succeeded
+            32
*** synced average
 
- 33
$ git log --format=%ci -1
+            33
 * Sync succeeded
 
- 34
$ git show -q --pretty=format:%G? HEAD
+            34
$ git log --format=%ci -1
 
- 35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 average
+            35
$ git show -q --pretty=format:%G? HEAD
 
- 36
 * Cache regenerated successfully
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 average
+
+ 37
 * Cache regenerated successfully
 
diff --git a/average.txt b/average.txt index 07c5376c7b2e..aadd45546566 100644 --- a/average.txt +++ b/average.txt @@ -13,6 +13,7 @@ 'uri': 'git+ssh://git@github.com/AnAverageHuman/average.git'}], 'status': 'unofficial'} $ pmaint sync average +WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', 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: diff --git a/awesome.html b/awesome.html index f187a1f7afc3..e526f396adea 100644 --- a/awesome.html +++ b/awesome.html @@ -32,49 +32,47 @@
11
$ pmaint sync awesome
 
- 12
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 
- 13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
discouraged. You can squelch this message by running one of the following
 
- 14
discouraged. You can squelch this message by running one of the following
+            14
commands sometime before your next pull:
 
- 15
commands sometime before your next pull:
+            15
 
- 16
+            16
  git config pull.rebase false  # merge (the default strategy)
 
- 17
  git config pull.rebase false  # merge (the default strategy)
+            17
  git config pull.rebase true   # rebase
 
- 18
  git config pull.rebase true   # rebase
+            18
  git config pull.ff only       # fast-forward only
 
- 19
  git config pull.ff only       # fast-forward only
+            19
 
- 20
+            20
You can replace "git config" with "git config --global" to set a default
 
- 21
You can replace "git config" with "git config --global" to set a default
+            21
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 22
preference for all repositories. You can also pass --rebase, --no-rebase,
+            22
or --ff-only on the command line to override the configured default per
 
- 23
or --ff-only on the command line to override the configured default per
+            23
invocation.
 
- 24
invocation.
+            24
 
- 25
+            25
Already up to date.
 
- 26
Already up to date.
+            26
*** syncing awesome
 
- 27
*** syncing awesome
+            27
*** synced awesome
 
- 28
*** synced awesome
+            28
 * Sync succeeded
 
- 29
 * Sync succeeded
+            29
$ git log --format=%ci -1
 
- 30
$ git log --format=%ci -1
+            30
$ git show -q --pretty=format:%G? HEAD
 
- 31
$ git show -q --pretty=format:%G? HEAD
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
 
- 32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 awesome
-
- 33
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 
diff --git a/awesome.txt b/awesome.txt index d4ff85395c26..3a936dd64df3 100644 --- a/awesome.txt +++ b/awesome.txt @@ -9,7 +9,6 @@ 'uri': 'https://gitlab.awesome-it.de/overlays/awesome.git'}], 'status': 'unofficial'} $ pmaint sync awesome -WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', 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: diff --git a/fusion809.html b/fusion809.html index c10edebfcb52..27afc1d26ea8 100644 --- a/fusion809.html +++ b/fusion809.html @@ -38,61 +38,63 @@
14
$ pmaint sync fusion809
 
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 16
discouraged. You can squelch this message by running one of the following
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 
- 17
commands sometime before your next pull:
+            17
discouraged. You can squelch this message by running one of the following
 
- 18
+            18
commands sometime before your next pull:
 
- 19
  git config pull.rebase false  # merge (the default strategy)
+            19
 
- 20
  git config pull.rebase true   # rebase
+            20
  git config pull.rebase false  # merge (the default strategy)
 
- 21
  git config pull.ff only       # fast-forward only
+            21
  git config pull.rebase true   # rebase
 
- 22
+            22
  git config pull.ff only       # fast-forward only
 
- 23
You can replace "git config" with "git config --global" to set a default
+            23
 
- 24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
You can replace "git config" with "git config --global" to set a default
 
- 25
or --ff-only on the command line to override the configured default per
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 26
invocation.
+            26
or --ff-only on the command line to override the configured default per
 
- 27
+            27
invocation.
 
- 28
Already up to date.
+            28
 
- 29
*** syncing fusion809
+            29
Already up to date.
 
- 30
*** synced fusion809
+            30
*** syncing fusion809
 
- 31
 * Sync succeeded
+            31
*** synced fusion809
 
- 32
$ git log --format=%ci -1
+            32
 * Sync succeeded
 
- 33
$ git show -q --pretty=format:%G? HEAD
+            33
$ git log --format=%ci -1
 
- 34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
+            34
$ git show -q --pretty=format:%G? HEAD
 
- 35
 * app-editors/gvim-8.2.2591: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fusion809
+
+ 36
 * app-editors/gvim-8.2.2591: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 
[FATAL] - 36
 * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            37
 * app-editors/gvim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 
[FATAL] - 37
 * app-editors/vim-8.2.2591: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            38
 * app-editors/vim-8.2.2591: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 
[FATAL] - 38
 * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
+            39
 * app-editors/vim-9999: failed sourcing ebuild: inherit requires unknown eclass: fdo-mime.eclass
 
[FATAL] - 39
 * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            40
 * sci-chemistry/avogadro-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL] - 40
 * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            41
 * sci-chemistry/avogadro-1.2.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL] - 41
 * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            42
 * sys-process/ps_mem-3.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL] - 42
 * Cache regen failed with 1
+            43
 * Cache regen failed with 1
 
diff --git a/fusion809.txt b/fusion809.txt index 5f627454441d..2da9373e0db4 100644 --- a/fusion809.txt +++ b/fusion809.txt @@ -12,6 +12,7 @@ 'uri': 'git://github.com/fusion809/fusion809-overlay.git'}], 'status': 'unofficial'} $ pmaint sync fusion809 +WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', 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: diff --git a/fuverlay.html b/fuverlay.html index 09692c24bb07..af35df3f5dfb 100644 --- a/fuverlay.html +++ b/fuverlay.html @@ -32,49 +32,51 @@
11
$ pmaint sync fuverlay
 
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 13
discouraged. You can squelch this message by running one of the following
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 
- 14
commands sometime before your next pull:
+            14
discouraged. You can squelch this message by running one of the following
 
- 15
+            15
commands sometime before your next pull:
 
- 16
  git config pull.rebase false  # merge (the default strategy)
+            16
 
- 17
  git config pull.rebase true   # rebase
+            17
  git config pull.rebase false  # merge (the default strategy)
 
- 18
  git config pull.ff only       # fast-forward only
+            18
  git config pull.rebase true   # rebase
 
- 19
+            19
  git config pull.ff only       # fast-forward only
 
- 20
You can replace "git config" with "git config --global" to set a default
+            20
 
- 21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
You can replace "git config" with "git config --global" to set a default
 
- 22
or --ff-only on the command line to override the configured default per
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 23
invocation.
+            23
or --ff-only on the command line to override the configured default per
 
- 24
+            24
invocation.
 
- 25
Already up to date.
+            25
 
- 26
*** syncing fuverlay
+            26
Already up to date.
 
- 27
*** synced fuverlay
+            27
*** syncing fuverlay
 
- 28
 * Sync succeeded
+            28
*** synced fuverlay
 
- 29
$ git log --format=%ci -1
+            29
 * Sync succeeded
 
- 30
$ git show -q --pretty=format:%G? HEAD
+            30
$ git log --format=%ci -1
 
- 31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fuverlay
+            31
$ git show -q --pretty=format:%G? HEAD
 
- 32
 * dev-libs/libkqueue-2.3.1: failed sourcing ebuild: EAPI=6 is not supported
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fuverlay
+
+ 33
 * dev-libs/libkqueue-2.3.1: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL] - 33
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 
diff --git a/fuverlay.txt b/fuverlay.txt index 33b13536a35f..b112695ff91d 100644 --- a/fuverlay.txt +++ b/fuverlay.txt @@ -9,6 +9,7 @@ 'source': [{'type': 'git', 'uri': 'https://github.com/funkill/fuverlay.git'}], 'status': 'unofficial'} $ pmaint sync fuverlay +WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', 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: diff --git a/gentoo.html b/gentoo.html index 3a362f926286..ac6f7bf766b1 100644 --- a/gentoo.html +++ b/gentoo.html @@ -64,53 +64,21 @@
27
 
- 28
From https://anongit.gentoo.org/git/repo/gentoo
+            28
Already up to date.
 
- 29
   12ecf53c75e..3b407579d09  master     -> origin/master
+            29
*** syncing gentoo
 
- 30
Updating 12ecf53c75e..3b407579d09
+            30
*** synced gentoo
 
- 31
Fast-forward
+            31
 * Sync succeeded
 
- 32
 app-editors/dhex/Manifest                          |  1 +
+            32
$ git log --format=%ci -1
 
- 33
 app-editors/dhex/dhex-0.69.ebuild                  | 35 ++++++++++++++++++++
+            33
$ git show -q --pretty=format:%G? HEAD
 
- 34
 app-editors/dhex/files/dhex-0.69-Makefile.patch    | 14 ++++++++
+            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
 
- 35
 .../files/menu-cache-1.1.0-memleak.patch           | 37 +++++++++++++++++++++
-
- 36
 lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild    | 37 +++++++++++++++++++++
-
- 37
 profiles/package.mask                              |  6 ++++
-
- 38
 x11-wm/openbox/openbox-3.6.1-r3.ebuild             | 38 ++++++++++++----------
-
- 39
 x11-wm/openbox/openbox-9999.ebuild                 | 38 ++++++++++++----------
-
- 40
 8 files changed, 172 insertions(+), 34 deletions(-)
-
- 41
 create mode 100644 app-editors/dhex/dhex-0.69.ebuild
-
- 42
 create mode 100644 app-editors/dhex/files/dhex-0.69-Makefile.patch
-
- 43
 create mode 100644 lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
-
- 44
 create mode 100644 lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
-
- 45
*** syncing gentoo
-
- 46
*** synced gentoo
-
- 47
 * Sync succeeded
-
- 48
$ git log --format=%ci -1
-
- 49
$ git show -q --pretty=format:%G? HEAD
-
- 50
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo
-
- 51
 * Cache regenerated successfully
+            35
 * Cache regenerated successfully
 
diff --git a/gentoo.txt b/gentoo.txt index cdcd52a6a45d..8058c350aba2 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -25,23 +25,7 @@ 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. -From https://anongit.gentoo.org/git/repo/gentoo - 12ecf53c75e..3b407579d09 master -> origin/master -Updating 12ecf53c75e..3b407579d09 -Fast-forward - app-editors/dhex/Manifest | 1 + - app-editors/dhex/dhex-0.69.ebuild | 35 ++++++++++++++++++++ - app-editors/dhex/files/dhex-0.69-Makefile.patch | 14 ++++++++ - .../files/menu-cache-1.1.0-memleak.patch | 37 +++++++++++++++++++++ - lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild | 37 +++++++++++++++++++++ - profiles/package.mask | 6 ++++ - x11-wm/openbox/openbox-3.6.1-r3.ebuild | 38 ++++++++++++---------- - x11-wm/openbox/openbox-9999.ebuild | 38 ++++++++++++---------- - 8 files changed, 172 insertions(+), 34 deletions(-) - create mode 100644 app-editors/dhex/dhex-0.69.ebuild - create mode 100644 app-editors/dhex/files/dhex-0.69-Makefile.patch - create mode 100644 lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch - create mode 100644 lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild +Already up to date. *** syncing gentoo *** synced gentoo * Sync succeeded diff --git a/index.html b/index.html index 77e35cf817a4..d7c1140a274a 100644 --- a/index.html +++ b/index.html @@ -853,7 +853,7 @@ -
Generated based on results from 2021-03-14 23:20:50 UTC
+
Generated based on results from 2021-03-14 23:35:48 UTC
\ No newline at end of file diff --git a/jkolo.html b/jkolo.html index 9e06037ee925..eec4aab9bd0a 100644 --- a/jkolo.html +++ b/jkolo.html @@ -32,51 +32,53 @@
11
$ pmaint sync jkolo
 
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 13
discouraged. You can squelch this message by running one of the following
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 
- 14
commands sometime before your next pull:
+            14
discouraged. You can squelch this message by running one of the following
 
- 15
+            15
commands sometime before your next pull:
 
- 16
  git config pull.rebase false  # merge (the default strategy)
+            16
 
- 17
  git config pull.rebase true   # rebase
+            17
  git config pull.rebase false  # merge (the default strategy)
 
- 18
  git config pull.ff only       # fast-forward only
+            18
  git config pull.rebase true   # rebase
 
- 19
+            19
  git config pull.ff only       # fast-forward only
 
- 20
You can replace "git config" with "git config --global" to set a default
+            20
 
- 21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
You can replace "git config" with "git config --global" to set a default
 
- 22
or --ff-only on the command line to override the configured default per
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 23
invocation.
+            23
or --ff-only on the command line to override the configured default per
 
- 24
+            24
invocation.
 
- 25
Already up to date.
+            25
 
- 26
*** syncing jkolo
+            26
Already up to date.
 
- 27
*** synced jkolo
+            27
*** syncing jkolo
 
- 28
 * Sync succeeded
+            28
*** synced jkolo
 
- 29
$ git log --format=%ci -1
+            29
 * Sync succeeded
 
- 30
$ git show -q --pretty=format:%G? HEAD
+            30
$ git log --format=%ci -1
 
- 31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
+            31
$ git show -q --pretty=format:%G? HEAD
 
- 32
 * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jkolo
+
+ 33
 * app-crypt/certbot-dns-rfc2136-0.27.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL] - 33
 * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            34
 * app-crypt/yubikey-piv-manager-1.4.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL] - 34
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 
diff --git a/jkolo.txt b/jkolo.txt index 72ad6d77556e..786e6a693cbe 100644 --- a/jkolo.txt +++ b/jkolo.txt @@ -9,6 +9,7 @@ 'uri': 'https://git.kolosowscy.pl/jurek/gentoo-overlay.git'}], 'status': 'unofficial'} $ pmaint sync jkolo +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', 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: diff --git a/jm-overlay.html b/jm-overlay.html index 9f14911c6950..aed927154a98 100644 --- a/jm-overlay.html +++ b/jm-overlay.html @@ -32,47 +32,49 @@
11
$ pmaint sync jm-overlay
 
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 13
discouraged. You can squelch this message by running one of the following
+            13
warning: Pulling without specifying how to reconcile divergent branches is
 
- 14
commands sometime before your next pull:
+            14
discouraged. You can squelch this message by running one of the following
 
- 15
+            15
commands sometime before your next pull:
 
- 16
  git config pull.rebase false  # merge (the default strategy)
+            16
 
- 17
  git config pull.rebase true   # rebase
+            17
  git config pull.rebase false  # merge (the default strategy)
 
- 18
  git config pull.ff only       # fast-forward only
+            18
  git config pull.rebase true   # rebase
 
- 19
+            19
  git config pull.ff only       # fast-forward only
 
- 20
You can replace "git config" with "git config --global" to set a default
+            20
 
- 21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
You can replace "git config" with "git config --global" to set a default
 
- 22
or --ff-only on the command line to override the configured default per
+            22
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 23
invocation.
+            23
or --ff-only on the command line to override the configured default per
 
- 24
+            24
invocation.
 
- 25
Already up to date.
+            25
 
- 26
*** syncing jm-overlay
+            26
Already up to date.
 
- 27
*** synced jm-overlay
+            27
*** syncing jm-overlay
 
- 28
 * Sync succeeded
+            28
*** synced jm-overlay
 
- 29
$ git log --format=%ci -1
+            29
 * Sync succeeded
 
- 30
$ git show -q --pretty=format:%G? HEAD
+            30
$ git log --format=%ci -1
 
- 31
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+            31
$ git show -q --pretty=format:%G? HEAD
 
- 32
 * Cache regenerated successfully
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 jm-overlay
+
+ 33
 * Cache regenerated successfully
 
diff --git a/jm-overlay.txt b/jm-overlay.txt index c3c2a45f8ccd..7edd90856590 100644 --- a/jm-overlay.txt +++ b/jm-overlay.txt @@ -9,6 +9,7 @@ 'uri': 'https://github.com/Jannis234/jm-overlay.git'}], 'status': 'unofficial'} $ pmaint sync jm-overlay +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', 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: diff --git a/librepilot.html b/librepilot.html index 545d5d57573c..adcce5ade996 100644 --- a/librepilot.html +++ b/librepilot.html @@ -38,47 +38,49 @@
14
$ pmaint sync librepilot
 
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 
- 16
discouraged. You can squelch this message by running one of the following
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 
- 17
commands sometime before your next pull:
+            17
discouraged. You can squelch this message by running one of the following
 
- 18
+            18
commands sometime before your next pull:
 
- 19
  git config pull.rebase false  # merge (the default strategy)
+            19
 
- 20
  git config pull.rebase true   # rebase
+            20
  git config pull.rebase false  # merge (the default strategy)
 
- 21
  git config pull.ff only       # fast-forward only
+            21
  git config pull.rebase true   # rebase
 
- 22
+            22
  git config pull.ff only       # fast-forward only
 
- 23
You can replace "git config" with "git config --global" to set a default
+            23
 
- 24
preference for all repositories. You can also pass --rebase, --no-rebase,
+            24
You can replace "git config" with "git config --global" to set a default
 
- 25
or --ff-only on the command line to override the configured default per
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 
- 26
invocation.
+            26
or --ff-only on the command line to override the configured default per
 
- 27
+            27
invocation.
 
- 28
Already up to date.
+            28
 
- 29
*** syncing librepilot
+            29
Already up to date.
 
- 30
*** synced librepilot
+            30
*** syncing librepilot
 
- 31
 * Sync succeeded
+            31
*** synced librepilot
 
- 32
$ git log --format=%ci -1
+            32
 * Sync succeeded
 
- 33
$ git show -q --pretty=format:%G? HEAD
+            33
$ git log --format=%ci -1
 
- 34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
+            34
$ git show -q --pretty=format:%G? HEAD
 
- 35
 * Cache regenerated successfully
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 librepilot
+
+ 36
 * Cache regenerated successfully
 
diff --git a/librepilot.txt b/librepilot.txt index 0e40873b2449..f0816c187694 100644 --- a/librepilot.txt +++ b/librepilot.txt @@ -12,6 +12,7 @@ 'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}], 'status': 'unofficial'} $ pmaint sync librepilot +WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', 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: diff --git a/swegener.html b/swegener.html index 07d242c2607b..0f3228cacb7c 100644 --- a/swegener.html +++ b/swegener.html @@ -94,15 +94,15 @@
42
File list transfer time: 0.000 seconds
 
- 43
Total bytes sent: 139
+            43
Total bytes sent: 143
 
44
Total bytes received: 5.09K
 
45
 
- 46
sent 139 bytes  received 5.09K bytes  2.09K bytes/sec
+            46
sent 143 bytes  received 5.09K bytes  2.09K bytes/sec
 
- 47
total size is 107.78K  speedup is 20.61
+            47
total size is 107.78K  speedup is 20.59
 
48
*** syncing swegener
 
diff --git a/swegener.txt b/swegener.txt index e9b7baa42123..1eb0bc27ffa5 100644 --- a/swegener.txt +++ b/swegener.txt @@ -40,11 +40,11 @@ Matched data: 0 bytes File list size: 5.00K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 139 +Total bytes sent: 143 Total bytes received: 5.09K -sent 139 bytes received 5.09K bytes 2.09K bytes/sec -total size is 107.78K speedup is 20.61 +sent 143 bytes received 5.09K bytes 2.09K bytes/sec +total size is 107.78K speedup is 20.59 *** syncing swegener *** synced swegener * Sync succeeded diff --git a/zugaina.html b/zugaina.html index 41f3b5998144..335a57492985 100644 --- a/zugaina.html +++ b/zugaina.html @@ -48,21 +48,21 @@
19
Matched data: 0 bytes
 
- 20
File list size: 39.31K
+            20
File list size: 40.47K
 
21
File list generation time: 0.001 seconds
 
22
File list transfer time: 0.000 seconds
 
- 23
Total bytes sent: 495
+            23
Total bytes sent: 491
 
24
Total bytes received: 46.56K
 
25
 
- 26
sent 495 bytes  received 46.56K bytes  18.82K bytes/sec
+            26
sent 491 bytes  received 46.56K bytes  13.44K bytes/sec
 
- 27
total size is 2.19M  speedup is 46.53
+            27
total size is 2.19M  speedup is 46.54
 
28
*** syncing zugaina
 
diff --git a/zugaina.txt b/zugaina.txt index 49b731dc601d..a8ead11886bd 100644 --- a/zugaina.txt +++ b/zugaina.txt @@ -17,14 +17,14 @@ Total file size: 2.19M bytes Total transferred file size: 0 bytes Literal data: 0 bytes Matched data: 0 bytes -File list size: 39.31K +File list size: 40.47K File list generation time: 0.001 seconds File list transfer time: 0.000 seconds -Total bytes sent: 495 +Total bytes sent: 491 Total bytes received: 46.56K -sent 495 bytes received 46.56K bytes 18.82K bytes/sec -total size is 2.19M speedup is 46.53 +sent 491 bytes received 46.56K bytes 13.44K bytes/sec +total size is 2.19M speedup is 46.54 *** syncing zugaina *** synced zugaina * Sync succeeded -- cgit v1.2.3-65-gdbad