summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt27
1 files changed, 10 insertions, 17 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 85ddbe4ae169..9fb9318d9caf 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -18,24 +18,17 @@ WARNING:pkgcore:'genthree' repo at '/var/lib/repo-mirror-ci/sync/genthree' has u
WARNING:pkgcore:'xelnor' repo at '/var/lib/repo-mirror-ci/sync/xelnor' has unsupported profile format: build-id
WARNING:pkgcore:'xelnor' repo at '/var/lib/repo-mirror-ci/sync/xelnor' has unsupported profile format: build-id
*** syncing gentoo
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
- git pull <remote> <branch>
-
-*** failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-WARNING:pkgcore:'genthree' repo at '/var/lib/repo-mirror-ci/sync/genthree' has unsupported profile format: profile-bashrcs
-WARNING:pkgcore:'xelnor' repo at '/var/lib/repo-mirror-ci/sync/xelnor' has unsupported profile format: build-id
-WARNING:pkgcore:'xelnor' repo at '/var/lib/repo-mirror-ci/sync/xelnor' has unsupported profile format: build-id
-*** syncing gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Checking out files: 16% (15637/94869) Checking out files: 17% (16128/94869) Checking out files: 18% (17077/94869) Checking out files: 19% (18026/94869) Checking out files: 20% (18974/94869) Checking out files: 21% (19923/94869) Checking out files: 22% (20872/94869) Checking out files: 23% (21820/94869) Checking out files: 24% (22769/94869) Checking out files: 25% (23718/94869) Checking out files: 26% (24666/94869) Checking out files: 27% (25615/94869) Checking out files: 28% (26564/94869) Checking out files: 29% (27513/94869) Checking out files: 30% (28461/94869) Checking out files: 31% (29410/94869) Checking out files: 32% (30359/94869) Checking out files: 33% (31307/94869) Checking out files: 33% (31911/94869) Checking out files: 34% (32256/94869) Checking out files: 35% (33205/94869) Checking out files: 36% (34153/94869) Checking out files: 37% (35102/94869) Checking out files: 38% (36051/94869) Checking out files: 39% (36999/94869) Checking out files: 40% (37948/94869) Checking out files: 41% (38897/94869) Checking out files: 42% (39845/94869) Checking out files: 43% (40794/94869) Checking out files: 44% (41743/94869) Checking out files: 45% (42692/94869) Checking out files: 46% (43640/94869) Checking out files: 47% (44589/94869) Checking out files: 48% (45538/94869) Checking out files: 49% (46486/94869) Checking out files: 49% (46837/94869) Checking out files: 50% (47435/94869) Checking out files: 51% (48384/94869) Checking out files: 52% (49332/94869) Checking out files: 53% (50281/94869) Checking out files: 54% (51230/94869) Checking out files: 55% (52178/94869) Checking out files: 56% (53127/94869) Checking out files: 57% (54076/94869) Checking out files: 58% (55025/94869) Checking out files: 59% (55973/94869) Checking out files: 60% (56922/94869) Checking out files: 61% (57871/94869) Checking out files: 62% (58819/94869) Checking out files: 63% (59768/94869) Checking out files: 64% (60717/94869) Checking out files: 65% (61665/94869) Checking out files: 65% (61999/94869) Checking out files: 66% (62614/94869) Checking out files: 67% (63563/94869) Checking out files: 68% (64511/94869) Checking out files: 69% (65460/94869) Checking out files: 70% (66409/94869) Checking out files: 71% (67357/94869) Checking out files: 72% (68306/94869) Checking out files: 73% (69255/94869) Checking out files: 74% (70204/94869) Checking out files: 75% (71152/94869) Checking out files: 76% (72101/94869) Checking out files: 77% (73050/94869) Checking out files: 78% (73998/94869) Checking out files: 78% (74007/94869) Checking out files: 79% (74947/94869) Checking out files: 80% (75896/94869) Checking out files: 81% (76844/94869) Checking out files: 82% (77793/94869) Checking out files: 83% (78742/94869) Checking out files: 84% (79690/94869) Checking out files: 85% (80639/94869) Checking out files: 86% (81588/94869) Checking out files: 87% (82537/94869) Checking out files: 88% (83485/94869) Checking out files: 89% (84434/94869) Checking out files: 90% (85383/94869) Checking out files: 91% (86331/94869) Checking out files: 92% (87280/94869) Checking out files: 93% (88229/94869) Checking out files: 94% (89177/94869) Checking out files: 95% (90126/94869) Checking out files: 95% (90323/94869) Checking out files: 96% (91075/94869) Checking out files: 97% (92023/94869) Checking out files: 98% (92972/94869) Checking out files: 99% (93921/94869) Checking out files: 100% (94869/94869) Checking out files: 100% (94869/94869), done.
+From https://anongit.gentoo.org/git/repo/gentoo
+ 50bb1724f03..2e6e3a04618 master -> origin/master
+Updating 50bb1724f03..2e6e3a04618
+Fast-forward
+ app-crypt/gnupg/gnupg-2.2.8.ebuild | 2 +-
+ dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild | 2 +-
+ dev-libs/libgpg-error/libgpg-error-1.29.ebuild | 2 +-
+ profiles/package.mask | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo