From 86be59ffd5682308d77a4ad60ea499ecbe650891 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 24 Mar 2021 15:07:26 +0000 Subject: 2021-03-24T15:00:01Z --- waffle-builds.html | 56 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 21 deletions(-) (limited to 'waffle-builds.html') diff --git a/waffle-builds.html b/waffle-builds.html index bcce32994595..455ef579f061 100644 --- a/waffle-builds.html +++ b/waffle-builds.html @@ -38,47 +38,61 @@ 14
$ pmaint sync waffle-builds
- 15
*** syncing waffle-builds
+            15
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
warning: Pulling without specifying how to reconcile divergent branches is
+            16
*** syncing waffle-builds
 

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

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

-            19
+            19
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            28
+            28
invocation.
 

-            29
Already up to date.
+            29
 

-            30
*** synced waffle-builds
+            30
From https://github.com/FlyingWaffleDev/waffle-builds
 

-            31
 * Sync succeeded
+            31
   6199811..630b8b4  master     -> origin/master
 

-            32
$ git log --format=%ci -1
+            32
Updating 6199811..630b8b4
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
Fast-forward
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
+            34
 sys-kernel/genkernel/Manifest                      |  2 +-
 

-            35
 * Cache regenerated successfully
+            35
 .../files/genkernel-9999-plymouth-support.patch    | 40 ++++++++++------------
+

+            36
 2 files changed, 20 insertions(+), 22 deletions(-)
+

+            37
*** synced waffle-builds
+

+            38
 * Sync succeeded
+

+            39
$ git log --format=%ci -1
+

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

+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 waffle-builds
+

+            42
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad