From 5c1d71d150177127157cbbddbea11242208b1f3f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sat, 27 Mar 2021 14:05:28 +0000 Subject: 2021-03-27T14:00:01Z --- ring-overlay.html | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'ring-overlay.html') diff --git a/ring-overlay.html b/ring-overlay.html index 6644f52271c7..f69781ecef8b 100644 --- a/ring-overlay.html +++ b/ring-overlay.html @@ -44,61 +44,59 @@ 17
$ pmaint sync ring-overlay
- 18
WARNING:pkgcore:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
*** syncing ring-overlay
 

-            19
*** syncing ring-overlay
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            22
commands sometime before your next pull:
+            22
 

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

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

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

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

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

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

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

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

-            31
invocation.
+            31
 

-            32
+            32
Already up to date.
 

-            33
Already up to date.
+            33
*** synced ring-overlay
 

-            34
*** synced ring-overlay
+            34
 * Sync succeeded
 

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

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

-            37
$ git show -q --pretty=format:%G? HEAD
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ring-overlay
 

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 ring-overlay
-

-            39
 * net-libs/opendht-1.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            38
 * net-libs/opendht-1.7.3: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            40
 * net-libs/opendht-1.8.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            39
 * net-libs/opendht-1.8.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            41
 * net-libs/opendht-1.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            40
 * net-libs/opendht-1.9.4: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            42
 * net-libs/opendht-1.9.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            41
 * net-libs/opendht-1.9.5: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            43
 * net-libs/opendht-1.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            42
 * net-libs/opendht-1.10.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            44
 * net-libs/opendht-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            43
 * net-libs/opendht-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            45
 * Cache regen failed with 1
+            44
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad