From a17c702ea013d87d2fdba4445678f17ad0795f88 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 29 Oct 2020 01:40:33 +0000 Subject: 2020-10-29T00:58:54Z --- salfter.html | 60 +++++++++++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) (limited to 'salfter.html') diff --git a/salfter.html b/salfter.html index e32d97b86758..c0cf99cf4954 100644 --- a/salfter.html +++ b/salfter.html @@ -30,65 +30,51 @@ 10
$ pmaint sync salfter
- 11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
WARNING:pkgcore:gentoo repo at '/var/lib/repo-mirror-ci/sync/gentoo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            14
+            14
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            23
+            23
invocation.
 

-            24
From https://gitlab.com/salfter/portage
+            24
 

-            25
   93f488d..ed63158  master     -> origin/master
+            25
Already up to date.
 

-            26
Updating 93f488d..ed63158
+            26
*** syncing salfter
 

-            27
Fast-forward
+            27
*** synced salfter
 

-            28
 dev-python/youtube_dl/Manifest                    |  2 ++
+            28
 * Sync succeeded
 

-            29
 dev-python/youtube_dl/youtube_dl-2020.9.20.ebuild | 13 +++++++++++++
+            29
$ git log --format=%ci -1
 

-            30
 2 files changed, 15 insertions(+)
+            30
$ git show -q --pretty=format:%G? HEAD
 

-            31
 create mode 100644 dev-python/youtube_dl/Manifest
+            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 salfter
 

-            32
 create mode 100644 dev-python/youtube_dl/youtube_dl-2020.9.20.ebuild
-

-            33
*** syncing salfter
-

-            34
*** synced salfter
-

-            35
 * Sync succeeded
-

-            36
$ git log --format=%ci -1
-

-            37
$ git show -q --pretty=format:%G? HEAD
-

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 salfter
-

-            39
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            32
 * dev-python/jsonrpc-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            40
 * Cache regen failed with 1
+            33
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad