summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt48
1 files changed, 33 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 5cb612b3f36a..3b891ae5af04 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,41 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 83b3bcd831b..434bfabcc4f 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: 15% (13668/88346) Updating files: 16% (14136/88346) Updating files: 17% (15019/88346) Updating files: 18% (15903/88346) Updating files: 19% (16786/88346) Updating files: 20% (17670/88346) Updating files: 21% (18553/88346) Updating files: 22% (19437/88346) Updating files: 23% (20320/88346) Updating files: 24% (21204/88346) Updating files: 25% (22087/88346) Updating files: 26% (22970/88346) Updating files: 27% (23854/88346) Updating files: 28% (24737/88346) Updating files: 29% (25621/88346) Updating files: 29% (26296/88346) Updating files: 30% (26504/88346) Updating files: 31% (27388/88346) Updating files: 32% (28271/88346) Updating files: 33% (29155/88346) Updating files: 34% (30038/88346) Updating files: 35% (30922/88346) Updating files: 36% (31805/88346) Updating files: 37% (32689/88346) Updating files: 38% (33572/88346) Updating files: 39% (34455/88346) Updating files: 40% (35339/88346) Updating files: 41% (36222/88346) Updating files: 42% (37106/88346) Updating files: 43% (37989/88346) Updating files: 44% (38873/88346) Updating files: 45% (39756/88346) Updating files: 46% (40640/88346) Updating files: 46% (40800/88346) Updating files: 47% (41523/88346) Updating files: 48% (42407/88346) Updating files: 49% (43290/88346) Updating files: 50% (44173/88346) Updating files: 51% (45057/88346) Updating files: 52% (45940/88346) Updating files: 53% (46824/88346) Updating files: 54% (47707/88346) Updating files: 55% (48591/88346) Updating files: 56% (49474/88346) Updating files: 57% (50358/88346) Updating files: 58% (51241/88346) Updating files: 59% (52125/88346) Updating files: 60% (53008/88346) Updating files: 60% (53286/88346) Updating files: 61% (53892/88346) Updating files: 62% (54775/88346) Updating files: 63% (55658/88346) Updating files: 64% (56542/88346) Updating files: 65% (57425/88346) Updating files: 66% (58309/88346) Updating files: 67% (59192/88346) Updating files: 68% (60076/88346) Updating files: 69% (60959/88346) Updating files: 70% (61843/88346) Updating files: 71% (62726/88346) Updating files: 72% (63610/88346) Updating files: 73% (64493/88346) Updating files: 74% (65377/88346) Updating files: 74% (65835/88346) Updating files: 75% (66260/88346) Updating files: 76% (67143/88346) Updating files: 77% (68027/88346) Updating files: 78% (68910/88346) Updating files: 79% (69794/88346) Updating files: 80% (70677/88346) Updating files: 81% (71561/88346) Updating files: 82% (72444/88346) Updating files: 83% (73328/88346) Updating files: 84% (74211/88346) Updating files: 85% (75095/88346) Updating files: 86% (75978/88346) Updating files: 87% (76862/88346) Updating files: 88% (77745/88346) Updating files: 89% (78628/88346) Updating files: 90% (79512/88346) Updating files: 91% (80395/88346) Updating files: 91% (80940/88346) Updating files: 92% (81279/88346) Updating files: 93% (82162/88346) Updating files: 94% (83046/88346) Updating files: 95% (83929/88346) Updating files: 96% (84813/88346) Updating files: 97% (85696/88346) Updating files: 98% (86580/88346) Updating files: 99% (87463/88346) Updating files: 100% (88346/88346) Updating files: 100% (88346/88346), done.
+ 577e4619333..bb87218b995 master -> origin/master
+Updating 577e4619333..bb87218b995
+Fast-forward
+ app-arch/zstd/Manifest | 1 -
+ app-arch/zstd/zstd-1.3.7-r1.ebuild | 62 --------
+ app-arch/zstd/zstd-1.4.4-r3.ebuild | 69 ---------
+ app-text/xiphos/Manifest | 1 -
+ app-text/xiphos/xiphos-4.0.6a-r2.ebuild | 93 ------------
+ dev-util/byacc/Manifest | 1 -
+ dev-util/byacc/byacc-20191125.ebuild | 18 ---
+ net-analyzer/nload/nload-0.7.4.ebuild | 29 ----
+ net-misc/rsync/Manifest | 1 -
+ .../rsync/files/rsync-3.2.2-allow_bwlimit_0.patch | 77 ----------
+ .../rsync/files/rsync-3.2.2-zstd_see_token.patch | 31 ----
+ net-misc/rsync/rsync-3.2.2-r1.ebuild | 158 ---------------------
+ net-misc/rsync/rsync-3.2.3.ebuild | 2 +-
+ net-misc/rsync/rsync-9999.ebuild | 2 +-
+ sys-apps/memtester/Manifest | 1 +
+ sys-apps/memtester/memtester-4.4.0.ebuild | 27 ++++
+ sys-apps/smartmontools/Manifest | 1 -
+ sys-apps/smartmontools/smartmontools-7.0-r1.ebuild | 147 -------------------
+ 18 files changed, 30 insertions(+), 691 deletions(-)
+ delete mode 100644 app-arch/zstd/zstd-1.3.7-r1.ebuild
+ delete mode 100644 app-arch/zstd/zstd-1.4.4-r3.ebuild
+ delete mode 100644 app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+ delete mode 100644 dev-util/byacc/byacc-20191125.ebuild
+ delete mode 100644 net-analyzer/nload/nload-0.7.4.ebuild
+ delete mode 100644 net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch
+ delete mode 100644 net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch
+ delete mode 100644 net-misc/rsync/rsync-3.2.2-r1.ebuild
+ create mode 100644 sys-apps/memtester/memtester-4.4.0.ebuild
+ delete mode 100644 sys-apps/smartmontools/smartmontools-7.0-r1.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