From a5a935bfc4282d0c2eed4f0f5c32c42e3c5fa91a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 29 Dec 2020 05:34:56 +0000 Subject: 2020-12-29T05:30:01Z --- sattvik.html | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'sattvik.html') diff --git a/sattvik.html b/sattvik.html index 04cc6d41e0bc..a6289a442fea 100644 --- a/sattvik.html +++ b/sattvik.html @@ -42,51 +42,53 @@ 16
$ pmaint sync sattvik
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', 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 sattvik
+            31
Already up to date.
 

-            32
*** synced sattvik
+            32
*** syncing sattvik
 

-            33
 * Sync succeeded
+            33
*** synced sattvik
 

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

-            37
 * x11-misc/prismatik-5.11.2.23: failed sourcing ebuild: EAPI=6 is not supported
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sattvik
+

+            38
 * x11-misc/prismatik-5.11.2.23: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            38
 * x11-misc/prismatik-5.11.2.25: failed sourcing ebuild: EAPI=6 is not supported
+            39
 * x11-misc/prismatik-5.11.2.25: failed sourcing ebuild: EAPI=6 is not supported
 
[FATAL]
-            39
 * Cache regen failed with 1
+            40
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad