From 246f272a74dade77221d5f6f6e360d1dc2d2b192 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 2 Dec 2020 00:35:17 +0000 Subject: 2020-12-02T00:30:01Z --- gentoo-playground.html | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'gentoo-playground.html') diff --git a/gentoo-playground.html b/gentoo-playground.html index d177a7ca31e7..073fc8c22efc 100644 --- a/gentoo-playground.html +++ b/gentoo-playground.html @@ -44,53 +44,55 @@ 17
$ pmaint sync gentoo-playground
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
WARNING:pkgcore:dm9pZCAq repo at '/var/lib/repo-mirror-ci/sync/dm9pZCAq', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

-            20
commands sometime before your next pull:
+            20
discouraged. You can squelch this message by running one of the following
 

-            21
+            21
commands sometime before your next pull:
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
 

-            23
  git config pull.rebase true   # rebase
+            23
  git config pull.rebase false  # merge (the default strategy)
 

-            24
  git config pull.ff only       # fast-forward only
+            24
  git config pull.rebase true   # rebase
 

-            25
+            25
  git config pull.ff only       # fast-forward only
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
You can replace "git config" with "git config --global" to set a default
 

-            28
or --ff-only on the command line to override the configured default per
+            28
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            29
invocation.
+            29
or --ff-only on the command line to override the configured default per
 

-            30
+            30
invocation.
 

-            31
Already up to date.
+            31
 

-            32
*** syncing gentoo-playground
+            32
Already up to date.
 

-            33
*** synced gentoo-playground
+            33
*** syncing gentoo-playground
 

-            34
 * Sync succeeded
+            34
*** synced gentoo-playground
 

-            35
$ git log --format=%ci -1
+            35
 * Sync succeeded
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
$ git log --format=%ci -1
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-playground
+            37
$ git show -q --pretty=format:%G? HEAD
 

-            38
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo-playground
+

+            39
 * app-arch/xz-utils-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            39
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * games-strategy/ufo-ai-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            40
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            41
 * x11-themes/e-gtk-theme-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            41
 * Cache regen failed with 1
+            42
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad