From 80ac0fa21a7e8f604eb763abbdeb1a6c4108b0fb Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 30 Mar 2021 08:20:25 +0000 Subject: 2021-03-30T08:15:01Z --- gamarouns.html | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'gamarouns.html') diff --git a/gamarouns.html b/gamarouns.html index 18c768b4cce1..1641a664bf61 100644 --- a/gamarouns.html +++ b/gamarouns.html @@ -32,57 +32,55 @@ 11
$ pmaint sync gamarouns
- 12
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).
+            12
*** syncing gamarouns
 

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

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

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

-            16
commands sometime before your next pull:
+            16
 

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

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

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

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

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

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

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

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

-            25
invocation.
+            25
 

-            26
+            26
Already up to date.
 

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

-            28
*** synced gamarouns
+            28
 * Sync succeeded
 

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

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

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

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gamarouns
-

-            33
 * app-misc/bosco-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            32
 * app-misc/bosco-9999: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            34
 * dev-python/sireader-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            33
 * dev-python/sireader-1.1.1: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            35
 * dev-python/spyder-3.2.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            34
 * dev-python/spyder-3.2.7: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            36
 * sci-geosciences/geographiclib-1.50: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
+            35
 * sci-geosciences/geographiclib-1.50: failed sourcing ebuild: No supported implementation in PYTHON_COMPAT., (python-utils-r1.eclass, line 156:  called die)
 
[FATAL]
-            37
 * Cache regen failed with 1
+            36
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad