From 51d5ebd666a783b576796599ee24e35c94cf83b5 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 25 Nov 2020 11:06:40 +0000 Subject: 2020-11-25T11:00:01Z --- jollheef-overlay.html | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'jollheef-overlay.html') diff --git a/jollheef-overlay.html b/jollheef-overlay.html index a3d3b5839af5..03e66447d802 100644 --- a/jollheef-overlay.html +++ b/jollheef-overlay.html @@ -42,53 +42,55 @@ 16
$ pmaint sync jollheef-overlay
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            20
+            20
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            29
+            29
invocation.
 

-            30
Already up to date.
+            30
 

-            31
*** syncing jollheef-overlay
+            31
Already up to date.
 

-            32
*** synced jollheef-overlay
+            32
*** syncing jollheef-overlay
 

-            33
 * Sync succeeded
+            33
*** synced jollheef-overlay
 

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

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

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jollheef-overlay
+            36
$ git show -q --pretty=format:%G? HEAD
 

-            37
 * app-misc/battery-watcher-daemon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 jollheef-overlay
+

+            38
 * app-misc/battery-watcher-daemon-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            38
 * net-im/signal-cli-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            39
 * net-im/signal-cli-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            39
 * net-print/kyocera-filters-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * net-print/kyocera-filters-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            40
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad