summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt25
1 files changed, 10 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index b04f6702d25e..73120311d5c9 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -16,22 +16,17 @@ pkgcore 0.12.28
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
*** syncing gentoo
From https://github.com/gentoo/gentoo
- e56830faba29..c6a5cd3bdde7 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>
-
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo
-*** syncing gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 20% (18247/89138) Updating files: 21% (18719/89138) Updating files: 22% (19611/89138) Updating files: 23% (20502/89138) Updating files: 24% (21394/89138) Updating files: 25% (22285/89138) Updating files: 26% (23176/89138) Updating files: 27% (24068/89138) Updating files: 28% (24959/89138) Updating files: 29% (25851/89138) Updating files: 30% (26742/89138) Updating files: 31% (27633/89138) Updating files: 32% (28525/89138) Updating files: 33% (29416/89138) Updating files: 34% (30307/89138) Updating files: 35% (31199/89138) Updating files: 36% (32090/89138) Updating files: 37% (32982/89138) Updating files: 38% (33873/89138) Updating files: 39% (34764/89138) Updating files: 40% (35656/89138) Updating files: 41% (36547/89138) Updating files: 42% (37438/89138) Updating files: 42% (37571/89138) Updating files: 43% (38330/89138) Updating files: 44% (39221/89138) Updating files: 45% (40113/89138) Updating files: 46% (41004/89138) Updating files: 47% (41895/89138) Updating files: 48% (42787/89138) Updating files: 49% (43678/89138) Updating files: 50% (44569/89138) Updating files: 51% (45461/89138) Updating files: 52% (46352/89138) Updating files: 53% (47244/89138) Updating files: 54% (48135/89138) Updating files: 55% (49026/89138) Updating files: 56% (49918/89138) Updating files: 57% (50809/89138) Updating files: 58% (51701/89138) Updating files: 59% (52592/89138) Updating files: 60% (53483/89138) Updating files: 61% (54375/89138) Updating files: 61% (54991/89138) Updating files: 62% (55266/89138) Updating files: 63% (56157/89138) Updating files: 64% (57049/89138) Updating files: 65% (57940/89138) Updating files: 66% (58832/89138) Updating files: 67% (59723/89138) Updating files: 68% (60614/89138) Updating files: 69% (61506/89138) Updating files: 70% (62397/89138) Updating files: 71% (63288/89138) Updating files: 72% (64180/89138) Updating files: 73% (65071/89138) Updating files: 74% (65963/89138) Updating files: 75% (66854/89138) Updating files: 76% (67745/89138) Updating files: 77% (68637/89138) Updating files: 78% (69528/89138) Updating files: 79% (70420/89138) Updating files: 80% (71311/89138) Updating files: 81% (72202/89138) Updating files: 82% (73094/89138) Updating files: 82% (73832/89138) Updating files: 83% (73985/89138) Updating files: 84% (74876/89138) Updating files: 85% (75768/89138) Updating files: 86% (76659/89138) Updating files: 87% (77551/89138) Updating files: 88% (78442/89138) Updating files: 89% (79333/89138) Updating files: 90% (80225/89138) Updating files: 91% (81116/89138) Updating files: 92% (82007/89138) Updating files: 93% (82899/89138) Updating files: 94% (83790/89138) Updating files: 95% (84682/89138) Updating files: 96% (85573/89138) Updating files: 97% (86464/89138) Updating files: 98% (87356/89138) Updating files: 99% (88247/89138) Updating files: 100% (89138/89138) Updating files: 100% (89138/89138), done.
+ c6a5cd3bdde7..011242d90c24 master -> origin/master
+Updating c6a5cd3bdde7..011242d90c24
+Fast-forward
+ dev-ruby/ascii85/Manifest | 2 +-
+ ...i85-1.1.0-r1.ebuild => ascii85-1.1.1-r1.ebuild} | 3 ++-
+ dev-ruby/ascii85/ascii85-2.0.1.ebuild | 29 ++++++++++++++++++++++
+ 3 files changed, 32 insertions(+), 2 deletions(-)
+ rename dev-ruby/ascii85/{ascii85-1.1.0-r1.ebuild => ascii85-1.1.1-r1.ebuild} (90%)
+ create mode 100644 dev-ruby/ascii85/ascii85-2.0.1.ebuild
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 gentoo