From 2c1de477238c900f4d075b7a95636c63a53432ee Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 3 May 2021 10:19:54 +0000 Subject: 2021-05-03T10:15:01Z --- octopus.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'octopus.html') diff --git a/octopus.html b/octopus.html index b1897dfd82df..b3a8a48af236 100644 --- a/octopus.html +++ b/octopus.html @@ -32,49 +32,51 @@ 11
$ pmaint sync octopus
- 12
*** syncing octopus
+            12
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            13
warning: Pulling without specifying how to reconcile divergent branches is
+            13
*** syncing octopus
 

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

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

-            16
+            16
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            25
+            25
invocation.
 

-            26
Already up to date.
+            26
 

-            27
*** synced octopus
+            27
Already up to date.
 

-            28
 * Sync succeeded
+            28
*** synced octopus
 

-            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 octopus
+            31
$ git show -q --pretty=format:%G? HEAD
 

-            32
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
+            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 octopus
+

+            33
 * net-p2p/opendchub-0.8.3: failed sourcing ebuild: autotools: EAPI 4 not supported, (autotools.eclass, line  35:  called die)
 
[FATAL]
-            33
 * Cache regen failed with 1
+            34
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad