From 0670cfe3088ec78548297686d3e47145e16db7bc Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 9 Mar 2021 07:22:08 +0000 Subject: 2021-03-09T07:15:01Z --- archenroot.html | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'archenroot.html') diff --git a/archenroot.html b/archenroot.html index 3d9031a38bf8..64947437caa7 100644 --- a/archenroot.html +++ b/archenroot.html @@ -38,53 +38,55 @@ 14
$ pmaint sync archenroot
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', 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 archenroot
+            29
Already up to date.
 

-            30
*** synced archenroot
+            30
*** syncing archenroot
 

-            31
 * Sync succeeded
+            31
*** synced archenroot
 

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

-            35
 * app-editors/atom-1.28.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 archenroot
+

+            36
 * app-editors/atom-1.28.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            36
 * dev-util/pykickstart-1.99.54: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            37
 * dev-util/pykickstart-1.99.54: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            37
 * dev-util/pykickstart-1.99.66.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
+            38
 * dev-util/pykickstart-1.99.66.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT.
 
[FATAL]
-            38
 * Cache regen failed with 1
+            39
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad