From 0da030774f402c55c5d16557c59a61f6bac8ea71 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 9 Apr 2021 02:34:44 +0000 Subject: 2021-04-09T02:30:01Z --- stowe-verlay.html | 54 ++++++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'stowe-verlay.html') diff --git a/stowe-verlay.html b/stowe-verlay.html index 9ac1a94fd1b8..9c69f8d41196 100644 --- a/stowe-verlay.html +++ b/stowe-verlay.html @@ -40,59 +40,57 @@ 15
$ pmaint sync stowe-verlay
- 16
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).
+            16
*** syncing stowe-verlay
 

-            17
*** syncing stowe-verlay
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            20
commands sometime before your next pull:
+            20
 

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

-            31
Already up to date.
+            31
*** synced stowe-verlay
 

-            32
*** synced stowe-verlay
+            32
 * Sync succeeded
 

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

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

-            35
$ git show -q --pretty=format:%G? HEAD
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stowe-verlay
 

-            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 stowe-verlay
-

-            37
 * net-analyzer/nagios-check_unifi-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            36
 * net-analyzer/nagios-check_unifi-1.0: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            38
 * net-fs/winexe-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            37
 * net-fs/winexe-1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            39
 * net-fs/winexe-1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            38
 * net-fs/winexe-1.1-r1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            40
 * net-fs/winexe-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            39
 * net-fs/winexe-1.2: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            41
 * net-fs/winexe-4.8.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            40
 * net-fs/winexe-4.8.6: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            42
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad