summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt27
1 files changed, 12 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index f2c2c8ddb94c..2b44d4f553a6 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -28,23 +28,20 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- 77173a6b3c9..610a1948941 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: 19% (17359/89369) Updating files: 20% (17874/89369) Updating files: 21% (18768/89369) Updating files: 22% (19662/89369) Updating files: 23% (20555/89369) Updating files: 24% (21449/89369) Updating files: 25% (22343/89369) Updating files: 26% (23236/89369) Updating files: 27% (24130/89369) Updating files: 28% (25024/89369) Updating files: 29% (25918/89369) Updating files: 30% (26811/89369) Updating files: 31% (27705/89369) Updating files: 32% (28599/89369) Updating files: 33% (29492/89369) Updating files: 34% (30386/89369) Updating files: 35% (31280/89369) Updating files: 36% (32173/89369) Updating files: 37% (33067/89369) Updating files: 38% (33961/89369) Updating files: 39% (34854/89369) Updating files: 40% (35748/89369) Updating files: 40% (35988/89369) Updating files: 41% (36642/89369) Updating files: 42% (37535/89369) Updating files: 43% (38429/89369) Updating files: 44% (39323/89369) Updating files: 45% (40217/89369) Updating files: 46% (41110/89369) Updating files: 47% (42004/89369) Updating files: 48% (42898/89369) Updating files: 49% (43791/89369) Updating files: 50% (44685/89369) Updating files: 51% (45579/89369) Updating files: 52% (46472/89369) Updating files: 53% (47366/89369) Updating files: 54% (48260/89369) Updating files: 55% (49153/89369) Updating files: 56% (50047/89369) Updating files: 57% (50941/89369) Updating files: 58% (51835/89369) Updating files: 59% (52728/89369) Updating files: 59% (52878/89369) Updating files: 60% (53622/89369) Updating files: 61% (54516/89369) Updating files: 62% (55409/89369) Updating files: 63% (56303/89369) Updating files: 64% (57197/89369) Updating files: 65% (58090/89369) Updating files: 66% (58984/89369) Updating files: 67% (59878/89369) Updating files: 68% (60771/89369) Updating files: 69% (61665/89369) Updating files: 70% (62559/89369) Updating files: 71% (63452/89369) Updating files: 72% (64346/89369) Updating files: 73% (65240/89369) Updating files: 74% (66134/89369) Updating files: 75% (67027/89369) Updating files: 76% (67921/89369) Updating files: 77% (68815/89369) Updating files: 78% (69708/89369) Updating files: 79% (70602/89369) Updating files: 79% (70795/89369) Updating files: 80% (71496/89369) Updating files: 81% (72389/89369) Updating files: 82% (73283/89369) Updating files: 83% (74177/89369) Updating files: 84% (75070/89369) Updating files: 85% (75964/89369) Updating files: 86% (76858/89369) Updating files: 87% (77752/89369) Updating files: 88% (78645/89369) Updating files: 89% (79539/89369) Updating files: 90% (80433/89369) Updating files: 91% (81326/89369) Updating files: 92% (82220/89369) Updating files: 93% (83114/89369) Updating files: 94% (84007/89369) Updating files: 95% (84901/89369) Updating files: 96% (85795/89369) Updating files: 97% (86688/89369) Updating files: 98% (87582/89369) Updating files: 99% (88476/89369) Updating files: 100% (89369/89369) Updating files: 100% (89369/89369), done.
+ 610a1948941..b5a220115a5 master -> origin/master
+Updating 610a1948941..b5a220115a5
+Fast-forward
+ app-misc/uptimed/Manifest | 1 +
+ app-misc/uptimed/uptimed-0.4.3.ebuild | 61 ++++++++++++++++++++++
+ dev-libs/libgpg-error/libgpg-error-1.38.ebuild | 2 +-
+ dev-libs/nss/nss-3.56.ebuild | 8 +++
+ .../libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild | 2 +-
+ net-misc/curl/curl-7.72.0.ebuild | 2 +-
+ 6 files changed, 73 insertions(+), 3 deletions(-)
+ create mode 100644 app-misc/uptimed/uptimed-0.4.3.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