summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt35
1 files changed, 14 insertions, 21 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 087fbec6c9b1..b4a73e55806d 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -15,28 +15,21 @@ 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
- 4b0ca70866bf..d02acb1704f6 master -> origin/master
-Updating 4b0ca70866bf..d02acb1704f6
-Fast-forward
- app-editors/vile/Manifest | 2 -
- app-editors/vile/vile-9.8y.ebuild | 58 -------
- app-editors/xvile/Manifest | 2 -
- app-editors/xvile/xvile-9.8y.ebuild | 59 -------
- sys-devel/gettext/Manifest | 2 -
- .../files/gettext-0.19.7-disable-libintl.patch | 30 ----
- .../files/gettext-0.20-parallel_install.patch | 37 -----
- .../files/gettext-0.21_rc1-avoid_eautomake.patch | 22 ---
- sys-devel/gettext/gettext-0.21.1.ebuild | 178 ---------------------
- 9 files changed, 390 deletions(-)
- delete mode 100644 app-editors/vile/vile-9.8y.ebuild
- delete mode 100644 app-editors/xvile/xvile-9.8y.ebuild
- delete mode 100644 sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
- delete mode 100644 sys-devel/gettext/files/gettext-0.20-parallel_install.patch
- delete mode 100644 sys-devel/gettext/files/gettext-0.21_rc1-avoid_eautomake.patch
- delete mode 100644 sys-devel/gettext/gettext-0.21.1.ebuild
+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: 23% (20482/88910) Updating files: 24% (21339/88910) Updating files: 25% (22228/88910) Updating files: 26% (23117/88910) Updating files: 27% (24006/88910) Updating files: 28% (24895/88910) Updating files: 29% (25784/88910) Updating files: 30% (26673/88910) Updating files: 31% (27563/88910) Updating files: 32% (28452/88910) Updating files: 33% (29341/88910) Updating files: 34% (30230/88910) Updating files: 35% (31119/88910) Updating files: 36% (32008/88910) Updating files: 37% (32897/88910) Updating files: 38% (33786/88910) Updating files: 39% (34675/88910) Updating files: 40% (35564/88910) Updating files: 41% (36454/88910) Updating files: 42% (37343/88910) Updating files: 43% (38232/88910) Updating files: 44% (39121/88910) Updating files: 45% (40010/88910) Updating files: 46% (40899/88910) Updating files: 47% (41788/88910) Updating files: 47% (42252/88910) Updating files: 48% (42677/88910) Updating files: 49% (43566/88910) Updating files: 50% (44455/88910) Updating files: 51% (45345/88910) Updating files: 52% (46234/88910) Updating files: 53% (47123/88910) Updating files: 54% (48012/88910) Updating files: 55% (48901/88910) Updating files: 56% (49790/88910) Updating files: 57% (50679/88910) Updating files: 58% (51568/88910) Updating files: 59% (52457/88910) Updating files: 60% (53346/88910) Updating files: 61% (54236/88910) Updating files: 62% (55125/88910) Updating files: 63% (56014/88910) Updating files: 64% (56903/88910) Updating files: 65% (57792/88910) Updating files: 66% (58681/88910) Updating files: 67% (59570/88910) Updating files: 68% (60459/88910) Updating files: 69% (61348/88910) Updating files: 69% (61921/88910) Updating files: 70% (62237/88910) Updating files: 71% (63127/88910) Updating files: 72% (64016/88910) Updating files: 73% (64905/88910) Updating files: 74% (65794/88910) Updating files: 75% (66683/88910) Updating files: 76% (67572/88910) Updating files: 77% (68461/88910) Updating files: 78% (69350/88910) Updating files: 79% (70239/88910) Updating files: 80% (71128/88910) Updating files: 81% (72018/88910) Updating files: 82% (72907/88910) Updating files: 83% (73796/88910) Updating files: 84% (74685/88910) Updating files: 85% (75574/88910) Updating files: 86% (76463/88910) Updating files: 87% (77352/88910) Updating files: 88% (78241/88910) Updating files: 89% (79130/88910) Updating files: 90% (80019/88910) Updating files: 91% (80909/88910) Updating files: 92% (81798/88910) Updating files: 93% (82687/88910) Updating files: 93% (83038/88910) Updating files: 94% (83576/88910) Updating files: 95% (84465/88910) Updating files: 96% (85354/88910) Updating files: 97% (86243/88910) Updating files: 98% (87132/88910) Updating files: 99% (88021/88910) Updating files: 100% (88910/88910) Updating files: 100% (88910/88910), done.
*** synced gentoo
- * Sync succeeded
+ * Sync succeeded after re-adding
$ 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