summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-06-10 22:05:05 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-06-10 22:05:05 +0000
commit91a93a43593ae97fc9cf06073ee9f3a43b32fc11 (patch)
treeedc32b55bbc6140ae73a3d2f63194efb9f1396c9 /gentoo.txt
parent2020-06-10T21:30:01Z (diff)
downloadrepos-91a93a43593ae97fc9cf06073ee9f3a43b32fc11.tar.gz
repos-91a93a43593ae97fc9cf06073ee9f3a43b32fc11.tar.bz2
repos-91a93a43593ae97fc9cf06073ee9f3a43b32fc11.zip
2020-06-10T22:00:01Z
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt43
1 files changed, 28 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index f99bdb8ed65b..463afc3ed685 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -13,23 +13,36 @@
'status': 'official'}
$ pmaint sync gentoo
From https://anongit.gentoo.org/git/repo/gentoo
- 854217442d0..da55b8191fe 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: 16% (14467/89193) Updating files: 17% (15163/89193) Updating files: 18% (16055/89193) Updating files: 19% (16947/89193) Updating files: 20% (17839/89193) Updating files: 21% (18731/89193) Updating files: 22% (19623/89193) Updating files: 23% (20515/89193) Updating files: 24% (21407/89193) Updating files: 25% (22299/89193) Updating files: 26% (23191/89193) Updating files: 27% (24083/89193) Updating files: 28% (24975/89193) Updating files: 29% (25866/89193) Updating files: 30% (26758/89193) Updating files: 31% (27650/89193) Updating files: 31% (27859/89193) Updating files: 32% (28542/89193) Updating files: 33% (29434/89193) Updating files: 34% (30326/89193) Updating files: 35% (31218/89193) Updating files: 36% (32110/89193) Updating files: 37% (33002/89193) Updating files: 38% (33894/89193) Updating files: 39% (34786/89193) Updating files: 40% (35678/89193) Updating files: 41% (36570/89193) Updating files: 42% (37462/89193) Updating files: 43% (38353/89193) Updating files: 44% (39245/89193) Updating files: 45% (40137/89193) Updating files: 46% (41029/89193) Updating files: 47% (41921/89193) Updating files: 48% (42813/89193) Updating files: 48% (43273/89193) Updating files: 49% (43705/89193) Updating files: 50% (44597/89193) Updating files: 51% (45489/89193) Updating files: 52% (46381/89193) Updating files: 53% (47273/89193) Updating files: 54% (48165/89193) Updating files: 55% (49057/89193) Updating files: 56% (49949/89193) Updating files: 57% (50841/89193) Updating files: 58% (51732/89193) Updating files: 59% (52624/89193) Updating files: 60% (53516/89193) Updating files: 61% (54408/89193) Updating files: 62% (55300/89193) Updating files: 62% (55825/89193) Updating files: 63% (56192/89193) Updating files: 64% (57084/89193) Updating files: 65% (57976/89193) Updating files: 66% (58868/89193) Updating files: 67% (59760/89193) Updating files: 68% (60652/89193) Updating files: 69% (61544/89193) Updating files: 70% (62436/89193) Updating files: 71% (63328/89193) Updating files: 72% (64219/89193) Updating files: 73% (65111/89193) Updating files: 74% (66003/89193) Updating files: 75% (66895/89193) Updating files: 76% (67787/89193) Updating files: 77% (68679/89193) Updating files: 77% (68734/89193) Updating files: 78% (69571/89193) Updating files: 79% (70463/89193) Updating files: 80% (71355/89193) Updating files: 81% (72247/89193) Updating files: 82% (73139/89193) Updating files: 83% (74031/89193) Updating files: 84% (74923/89193) Updating files: 85% (75815/89193) Updating files: 86% (76706/89193) Updating files: 87% (77598/89193) Updating files: 88% (78490/89193) Updating files: 89% (79382/89193) Updating files: 90% (80274/89193) Updating files: 91% (81166/89193) Updating files: 92% (82058/89193) Updating files: 93% (82950/89193) Updating files: 93% (83167/89193) Updating files: 94% (83842/89193) Updating files: 95% (84734/89193) Updating files: 96% (85626/89193) Updating files: 97% (86518/89193) Updating files: 98% (87410/89193) Updating files: 99% (88302/89193) Updating files: 100% (89193/89193) Updating files: 100% (89193/89193), done.
+ da55b8191fe..f1058995e5b master -> origin/master
+Updating da55b8191fe..f1058995e5b
+Fast-forward
+ profiles/arch/hppa/package.use.stable.mask | 4 +
+ profiles/package.mask | 8 --
+ sys-fs/zfs-kmod/Manifest | 2 -
+ sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild | 147 -------------------
+ sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild | 171 ----------------------
+ sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild | 4 +-
+ sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 2 +-
+ sys-fs/zfs/Manifest | 2 -
+ sys-fs/zfs/zfs-0.7.13-r1.ebuild | 218 ----------------------------
+ sys-fs/zfs/zfs-0.7.13-r2.ebuild | 220 ----------------------------
+ sys-fs/zfs/zfs-0.8.3-r1.ebuild | 224 -----------------------------
+ sys-fs/zfs/zfs-0.8.4-r1.ebuild | 4 +-
+ sys-kernel/spl/Manifest | 1 -
+ sys-kernel/spl/metadata.xml | 15 --
+ sys-kernel/spl/spl-0.7.13.ebuild | 119 ---------------
+ 15 files changed, 9 insertions(+), 1132 deletions(-)
+ delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild
+ delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild
+ delete mode 100644 sys-fs/zfs/zfs-0.7.13-r1.ebuild
+ delete mode 100644 sys-fs/zfs/zfs-0.7.13-r2.ebuild
+ delete mode 100644 sys-fs/zfs/zfs-0.8.3-r1.ebuild
+ delete mode 100644 sys-kernel/spl/Manifest
+ delete mode 100644 sys-kernel/spl/metadata.xml
+ delete mode 100644 sys-kernel/spl/spl-0.7.13.ebuild
*** 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