From e33cd2177cdc87b735a38a633f638b6c1b13e406 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:06:50 +0000 Subject: 2020-10-23T13:00:01Z --- nix-guix.html | 62 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) (limited to 'nix-guix.html') diff --git a/nix-guix.html b/nix-guix.html index 7312964fd16e..b67d1fa6f881 100644 --- a/nix-guix.html +++ b/nix-guix.html @@ -34,67 +34,63 @@ 12
$ pmaint sync nix-guix
- 13
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            13
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            14
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
WARNING:pkgcore:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            15
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            16
WARNING:pkgcore:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            17
WARNING:pkgcore:jamesbroadhead repo at '/var/lib/repo-mirror-ci/sync/jamesbroadhead', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            18
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
WARNING:pkgcore:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
WARNING:pkgcore:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            21
WARNING:pkgcore:mschiff repo at '/var/lib/repo-mirror-ci/sync/mschiff', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
warning: Pulling without specifying how to reconcile divergent branches is
 

-            22
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).
+            22
discouraged. You can squelch this message by running one of the following
 

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
commands sometime before your next pull:
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
 

-            25
commands sometime before your next pull:
+            25
  git config pull.rebase false  # merge (the default strategy)
 

-            26
+            26
  git config pull.rebase true   # rebase
 

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
  git config pull.ff only       # fast-forward only
 

-            28
  git config pull.rebase true   # rebase
+            28
 

-            29
  git config pull.ff only       # fast-forward only
+            29
You can replace "git config" with "git config --global" to set a default
 

-            30
+            30
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
or --ff-only on the command line to override the configured default per
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
invocation.
 

-            33
or --ff-only on the command line to override the configured default per
+            33
 

-            34
invocation.
+            34
Already up to date.
 

-            35
+            35
*** syncing nix-guix
 

-            36
Already up to date.
+            36
*** synced nix-guix
 

-            37
*** syncing nix-guix
+            37
 * Sync succeeded
 

-            38
*** synced nix-guix
+            38
$ git log --format=%ci -1
 

-            39
 * Sync succeeded
+            39
$ git show -q --pretty=format:%G? HEAD
 

-            40
$ git log --format=%ci -1
+            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nix-guix
 

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

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 nix-guix
-

-            43
 * Cache regenerated successfully
+            41
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad