summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt29
1 files changed, 14 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index a57ee7497c7e..420e35d6ca97 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,22 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 4f63e31bdce..3946a54e64f master -> origin/master
-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>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 20% (17660/86321) Updating files: 21% (18128/86321) Updating files: 22% (18991/86321) Updating files: 23% (19854/86321) Updating files: 24% (20718/86321) Updating files: 25% (21581/86321) Updating files: 26% (22444/86321) Updating files: 27% (23307/86321) Updating files: 28% (24170/86321) Updating files: 29% (25034/86321) Updating files: 30% (25897/86321) Updating files: 31% (26760/86321) Updating files: 32% (27623/86321) Updating files: 33% (28486/86321) Updating files: 34% (29350/86321) Updating files: 35% (30213/86321) Updating files: 36% (31076/86321) Updating files: 37% (31939/86321) Updating files: 38% (32802/86321) Updating files: 39% (33666/86321) Updating files: 40% (34529/86321) Updating files: 41% (35392/86321) Updating files: 42% (36255/86321) Updating files: 42% (36840/86321) Updating files: 43% (37119/86321) Updating files: 44% (37982/86321) Updating files: 45% (38845/86321) Updating files: 46% (39708/86321) Updating files: 47% (40571/86321) Updating files: 48% (41435/86321) Updating files: 49% (42298/86321) Updating files: 50% (43161/86321) Updating files: 51% (44024/86321) Updating files: 52% (44887/86321) Updating files: 53% (45751/86321) Updating files: 54% (46614/86321) Updating files: 55% (47477/86321) Updating files: 56% (48340/86321) Updating files: 57% (49203/86321) Updating files: 58% (50067/86321) Updating files: 59% (50930/86321) Updating files: 60% (51793/86321) Updating files: 61% (52656/86321) Updating files: 62% (53520/86321) Updating files: 62% (53961/86321) Updating files: 63% (54383/86321) Updating files: 64% (55246/86321) Updating files: 65% (56109/86321) Updating files: 66% (56972/86321) Updating files: 67% (57836/86321) Updating files: 68% (58699/86321) Updating files: 69% (59562/86321) Updating files: 70% (60425/86321) Updating files: 71% (61288/86321) Updating files: 72% (62152/86321) Updating files: 73% (63015/86321) Updating files: 74% (63878/86321) Updating files: 75% (64741/86321) Updating files: 76% (65604/86321) Updating files: 77% (66468/86321) Updating files: 78% (67331/86321) Updating files: 79% (68194/86321) Updating files: 80% (69057/86321) Updating files: 81% (69921/86321) Updating files: 82% (70784/86321) Updating files: 82% (71510/86321) Updating files: 83% (71647/86321) Updating files: 84% (72510/86321) Updating files: 85% (73373/86321) Updating files: 86% (74237/86321) Updating files: 87% (75100/86321) Updating files: 88% (75963/86321) Updating files: 89% (76826/86321) Updating files: 90% (77689/86321) Updating files: 91% (78553/86321) Updating files: 92% (79416/86321) Updating files: 93% (80279/86321) Updating files: 94% (81142/86321) Updating files: 95% (82005/86321) Updating files: 96% (82869/86321) Updating files: 97% (83732/86321) Updating files: 98% (84595/86321) Updating files: 98% (85095/86321) Updating files: 99% (85458/86321) Updating files: 100% (86321/86321) Updating files: 100% (86321/86321), done.
+ 3946a54e64f..c76f2307c45 master -> origin/master
+Updating 3946a54e64f..c76f2307c45
+Fast-forward
+ app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild | 10 +++++-----
+ app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild | 10 +++++-----
+ app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild | 8 ++++----
+ app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild | 12 ++++++------
+ media-sound/umurmur/umurmur-0.2.17-r4.ebuild | 6 +++---
+ media-sound/umurmur/umurmur-9999.ebuild | 4 ++--
+ net-libs/tox/tox-0.2.11-r1.ebuild | 2 +-
+ net-wireless/srslte/srslte-20.10.1-r1.ebuild | 4 ++--
+ net-wireless/srslte/srslte-9999.ebuild | 4 ++--
+ 9 files changed, 30 insertions(+), 30 deletions(-)
*** syncing gentoo
*** 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